diff --git a/BUGS b/BUGS
index 3c796b03c..00128f0b7 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2019-10-09
+Last updated: 2019-10-15
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -677,6 +677,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1754900 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1754900
   v2v: Use nbdkit-retry-filter on all nbdkit instances
 
+1761563 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1761563
+  mount_local_access() in lib/fuse.c wrongly returns -EACCES (affects guestmount)
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -707,7 +710,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1651500 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1651500
   v2v - support for -insecure option to support OSP SSL connection for VM migrations
 
-(229 bugs)
+(230 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -755,13 +758,7 @@ You can help by testing the fixes.
 1664318 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1664318
   Upgrade libguestfs package to 1.39.14
 
-1680361 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1680361
-  [v2v][RHV][Scale] v2v Migration to RHV failed on timed out waiting for transfer to finalize
-
-1753085 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1753085
-  Set qxl as default video mode for SUSE guest after converting to libvirt by v2v
-
-(16 bugs)
+(14 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
@@ -778,6 +775,9 @@ These bugs are in the VERIFIED state.
 1679966 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1679966
   virt-inspector fails with "error: int_of_string" on a Linux image when /etc/fstab contains a partionless device
 
+1680361 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1680361
+  [v2v][RHV][Scale] v2v Migration to RHV failed on timed out waiting for transfer to finalize
+
 1688062 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1688062
   Include of the updated rhev-apt in virt-v2v
 
@@ -820,9 +820,9 @@ These bugs are in the VERIFIED state.
 1750742 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1750742
   [v2v][RHV][Scale] v2v Migration to RHV failed on timed out waiting for transfer to finalize
 
-1753121 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1753121
-  [v2v][RHV][Scale] v2v Migration to RHV failed on timed out waiting for transfer to finalize [rhel-7.7.z]
+1753085 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1753085
+  Set qxl as default video mode for SUSE guest after converting to libvirt by v2v
 
-(19 bugs)
+(20 bugs)
 
 End of BUGS file.
diff --git a/Makefile.am b/Makefile.am
index dead252cd..a30b8287a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,6 +222,8 @@ EXTRA_DIST = \
 	bindtests \
 	cfg.mk \
 	check-mli.sh \
+	common/.gitignore \
+	common/README \
 	contrib/autobuild/autobuild.sh \
 	contrib/intro/libguestfs-intro.html \
 	contrib/intro/overview.png \
diff --git a/RELEASES b/RELEASES
index 8d20b0f33..b25dba8c6 100644
--- a/RELEASES
+++ b/RELEASES
@@ -2,6 +2,7 @@
 # in the form <version> <date>.  If you update the version field (in
 # configure.ac) you must also add the current date to this file.
 
+1.41.6    2019-10-15
 1.41.5    2019-10-08
 1.41.4    2019-09-02
 1.41.3    2019-09-02
diff --git a/configure.ac b/configure.ac
index c15541c97..20fd774e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [41])
-m4_define([libguestfs_release], [5])
+m4_define([libguestfs_release], [6])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
index a6a5838c4..def62f82c 100644
--- a/docs/C_SOURCE_FILES
+++ b/docs/C_SOURCE_FILES
@@ -13,6 +13,7 @@ cat/tail.c
 common/edit/file-edit.c
 common/edit/file-edit.h
 common/mlaugeas/augeas-c.c
+common/mlcustomize/dummy.c
 common/mlgettext/dummy.c
 common/mllibvirt/libvirt_c_epilogue.c
 common/mllibvirt/libvirt_c_oneoffs.c
diff --git a/po-docs/cs.po b/po-docs/cs.po
index f522438d7..2685bc2dd 100644
--- a/po-docs/cs.po
+++ b/po-docs/cs.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-09-11 04:54+0000\n"
 "Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -619,7 +619,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1204,41 +1204,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1462,7 +1463,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1551,7 +1552,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1848,7 +1849,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1872,7 +1873,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1894,7 +1895,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3253,7 +3254,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3279,7 +3280,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3305,7 +3306,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8504,13 +8505,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8538,7 +8539,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8550,10 +8551,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8561,10 +8562,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8575,10 +8576,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8589,10 +8590,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8602,12 +8603,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8615,12 +8617,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8629,7 +8632,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8637,7 +8640,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8647,13 +8650,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8663,13 +8666,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8679,18 +8682,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8698,19 +8701,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8718,7 +8721,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8729,7 +8732,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8739,7 +8742,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8749,7 +8752,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8757,32 +8760,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8790,12 +8795,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8803,7 +8808,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8812,7 +8817,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8821,24 +8826,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8846,24 +8851,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8871,13 +8876,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8885,8 +8890,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8895,8 +8900,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8905,20 +8910,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8926,12 +8931,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8940,8 +8945,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8950,12 +8955,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8963,12 +8968,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8977,18 +8982,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8996,18 +9001,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -9015,23 +9020,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9040,18 +9045,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9059,8 +9064,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9069,12 +9074,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9082,7 +9087,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9090,7 +9095,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9098,7 +9103,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9107,7 +9112,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9117,18 +9122,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9136,12 +9141,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9150,14 +9155,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9169,7 +9174,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9177,20 +9182,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9198,7 +9203,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9206,41 +9211,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9249,25 +9254,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9276,63 +9281,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9340,14 +9345,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9355,12 +9360,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9368,23 +9373,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9392,24 +9397,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9419,18 +9424,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9439,18 +9444,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9459,7 +9464,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9467,7 +9472,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9476,18 +9481,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12799,7 +12804,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16454,284 +16459,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16739,127 +16765,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16867,84 +16893,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16952,124 +16978,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17078,14 +17104,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17093,12 +17119,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17106,29 +17132,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17136,7 +17162,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17148,7 +17174,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17158,7 +17184,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17168,31 +17194,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17200,12 +17226,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17213,12 +17239,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17228,61 +17254,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17290,7 +17316,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17300,7 +17326,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17310,14 +17336,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17325,13 +17351,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17339,18 +17365,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17358,29 +17384,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17388,31 +17414,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17420,7 +17446,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17428,12 +17454,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17441,7 +17467,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17458,7 +17484,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17466,7 +17492,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17474,7 +17500,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17484,7 +17510,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17492,7 +17518,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17500,19 +17526,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17522,14 +17548,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17545,7 +17571,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17563,18 +17589,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17582,61 +17608,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17644,36 +17670,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17681,27 +17707,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17709,7 +17735,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17717,12 +17743,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17730,14 +17756,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17745,29 +17771,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17775,18 +17801,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17795,12 +17821,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17808,12 +17834,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17821,13 +17847,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17836,76 +17862,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17916,32 +17942,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17949,12 +17975,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17963,14 +17989,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17978,69 +18004,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18048,12 +18074,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18062,17 +18088,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18081,31 +18107,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18115,12 +18141,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18128,14 +18154,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18143,14 +18169,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18158,7 +18184,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18167,7 +18193,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18176,48 +18202,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18226,7 +18252,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18236,22 +18262,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18259,7 +18285,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18269,7 +18295,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18277,29 +18303,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18307,19 +18333,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18327,7 +18353,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18335,31 +18361,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18368,12 +18394,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18381,12 +18407,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18394,63 +18420,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18458,12 +18484,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18471,36 +18497,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18513,12 +18539,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18527,50 +18553,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/de.po b/po-docs/de.po
index 461779b5e..f73822f51 100644
--- a/po-docs/de.po
+++ b/po-docs/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 09:57+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -617,7 +617,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1200,41 +1200,42 @@ msgstr "Dieses Programm gibt Folgendes zurück:"
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1448,7 +1449,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1539,7 +1540,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1838,7 +1839,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1862,7 +1863,7 @@ msgstr "AUTOREN"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1884,7 +1885,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3262,7 +3263,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3288,7 +3289,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3314,7 +3315,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8579,13 +8580,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8613,7 +8614,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8625,10 +8626,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8636,10 +8637,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8655,10 +8656,10 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8674,10 +8675,10 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8687,12 +8688,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8700,12 +8702,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8714,7 +8717,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8722,7 +8725,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8732,13 +8735,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8748,13 +8751,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8764,18 +8767,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8783,19 +8786,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8803,7 +8806,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8814,7 +8817,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8824,7 +8827,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8834,7 +8837,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8842,32 +8845,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8875,12 +8880,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr "B<--delete> PFAD"
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8888,7 +8893,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8897,7 +8902,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8906,24 +8911,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr "Siehe auch: I<--upload>, I<--scrub>."
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr "B<--edit> DATEI:AUSDRUCK"
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8931,24 +8936,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr "B<--firstboot> SKRIPT"
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8956,13 +8961,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8970,8 +8975,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8980,8 +8985,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8990,20 +8995,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr "Siehe auch I<--run>."
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -9011,12 +9016,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9025,8 +9030,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -9035,12 +9040,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -9048,12 +9053,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9062,18 +9067,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -9081,18 +9086,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr "B<--mkdir> VERZEICHNIS"
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -9100,23 +9105,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr "B<--no-logfile>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9125,18 +9130,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9144,8 +9149,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9154,12 +9159,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr "B<--password-crypto> md5|sha256|sha512"
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9167,7 +9172,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9175,7 +9180,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9183,7 +9188,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9192,7 +9197,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9202,18 +9207,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr "legt das Root-Passwort fest."
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9221,12 +9226,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr "B<--run> SKRIPT"
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9235,14 +9240,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9254,7 +9259,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9262,20 +9267,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr "Siehe auch: I<--firstboot>, I<--attach>, I<--upload>."
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9283,7 +9288,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9291,41 +9296,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr "B<--scrub> DATEI"
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9334,25 +9339,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9361,63 +9366,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9425,14 +9430,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9440,12 +9445,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timezone> ZEITZONE"
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9453,23 +9458,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9477,24 +9482,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9504,18 +9509,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9524,18 +9529,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9544,7 +9549,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9552,7 +9557,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9561,18 +9566,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12900,7 +12905,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16555,284 +16560,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16840,127 +16866,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16968,84 +16994,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -17053,124 +17079,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17179,14 +17205,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17194,12 +17220,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17207,29 +17233,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17237,7 +17263,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17249,7 +17275,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17259,7 +17285,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17269,31 +17295,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17301,12 +17327,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17314,12 +17340,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17329,61 +17355,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17391,7 +17417,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17401,7 +17427,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17411,14 +17437,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17426,13 +17452,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17440,18 +17466,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17459,29 +17485,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17489,31 +17515,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17521,7 +17547,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17529,12 +17555,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17542,7 +17568,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17559,7 +17585,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17567,7 +17593,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17575,7 +17601,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17585,7 +17611,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17593,7 +17619,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17601,19 +17627,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17623,14 +17649,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17646,7 +17672,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17664,18 +17690,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17683,61 +17709,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17745,36 +17771,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17782,27 +17808,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17810,7 +17836,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17818,12 +17844,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17831,14 +17857,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17846,29 +17872,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17876,18 +17902,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17896,12 +17922,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17909,12 +17935,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17922,13 +17948,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17937,76 +17963,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -18017,32 +18043,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -18050,12 +18076,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -18064,14 +18090,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -18079,69 +18105,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18149,12 +18175,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18163,17 +18189,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18182,31 +18208,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18216,12 +18242,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18229,14 +18255,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18244,14 +18270,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18259,7 +18285,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18268,7 +18294,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18277,48 +18303,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18327,7 +18353,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18337,22 +18363,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18360,7 +18386,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18370,7 +18396,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18378,29 +18404,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18408,19 +18434,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18428,7 +18454,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18436,31 +18462,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18469,12 +18495,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18482,12 +18508,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18495,63 +18521,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18559,12 +18585,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18572,36 +18598,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18614,12 +18640,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18628,50 +18654,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/en_GB.po b/po-docs/en_GB.po
index a94914ba0..ae29b4299 100644
--- a/po-docs/en_GB.po
+++ b/po-docs/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:15+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -660,7 +660,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1344,41 +1344,42 @@ msgstr "This program returns:"
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1597,7 +1598,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1688,7 +1689,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -2036,7 +2037,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -2060,7 +2061,7 @@ msgstr "AUTHORS"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -2082,7 +2083,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3444,7 +3445,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3470,7 +3471,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3496,7 +3497,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -9019,13 +9020,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -9053,7 +9054,7 @@ msgid "comment"
 msgstr "comment"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -9065,10 +9066,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -9076,10 +9077,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -9090,10 +9091,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -9104,10 +9105,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -9117,12 +9118,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -9130,12 +9132,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -9144,7 +9147,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -9152,7 +9155,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -9162,13 +9165,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -9178,13 +9181,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -9194,18 +9197,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -9213,19 +9216,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -9233,7 +9236,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -9244,7 +9247,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -9254,7 +9257,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -9264,7 +9267,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -9272,32 +9275,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -9305,12 +9310,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -9318,7 +9323,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -9327,7 +9332,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -9336,24 +9341,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -9363,24 +9368,24 @@ msgstr ""
 "by the shell."
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr "Note that this option is only available when Perl 5 is installed."
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -9388,13 +9393,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -9402,8 +9407,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -9412,8 +9417,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -9422,20 +9427,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -9443,12 +9448,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9457,8 +9462,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -9467,12 +9472,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -9480,12 +9485,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9494,18 +9499,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -9513,18 +9518,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -9532,23 +9537,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9557,18 +9562,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9576,8 +9581,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9586,12 +9591,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9599,7 +9604,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9607,7 +9612,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9617,7 +9622,7 @@ msgstr ""
 "secure against modern attacks."
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9629,7 +9634,7 @@ msgstr ""
 "override libguestfs by specifying this option."
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9639,18 +9644,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9658,12 +9663,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9672,14 +9677,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9691,7 +9696,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9699,20 +9704,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9720,7 +9725,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9728,41 +9733,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9771,25 +9776,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9798,63 +9803,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9862,14 +9867,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9877,12 +9882,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9890,23 +9895,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9914,24 +9919,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9941,18 +9946,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9961,18 +9966,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9981,7 +9986,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9989,7 +9994,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9998,18 +10003,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -13420,7 +13425,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -17493,285 +17498,306 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr "Outside contributions, experimental parts."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr "L<virt-df(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr "L<virt-edit(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr "C API example code."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -17782,132 +17808,132 @@ msgstr ""
 "L<virt-tar-out(1)>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr "L<virt-format(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
-#. type: textblock
-#: ../docs/guestfs-hacking.pod:228
-msgid ""
-"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
-msgstr ""
-"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
-
-#. type: =item
-#: ../docs/guestfs-hacking.pod:230
-msgid "F<generator>"
-msgstr ""
-
-#. type: textblock
-#: ../docs/guestfs-hacking.pod:232
-msgid ""
-"The crucially important generator, used to automatically generate large "
-"amounts of boilerplate C code for things like RPC and bindings."
-msgstr ""
-"The crucially important generator, used to automatically generate large "
-"amounts of boilerplate C code for things like RPC and bindings."
-
-#. type: =item
-#: ../docs/guestfs-hacking.pod:235
-msgid "F<get-kernel>"
-msgstr ""
-
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:237
-msgid "L<virt-get-kernel(1)> command and documentation."
+msgid ""
+"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
+"L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:239
-msgid "F<gnulib>"
+msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:241
 msgid ""
-"Gnulib is used as a portability library.  A copy of gnulib is included under "
-"here."
+"The crucially important generator, used to automatically generate large "
+"amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
-"Gnulib is used as a portability library.  A copy of gnulib is included under "
-"here."
+"The crucially important generator, used to automatically generate large "
+"amounts of boilerplate C code for things like RPC and bindings."
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:244
-msgid "F<inspector>"
+msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:246
-msgid "L<virt-inspector(1)>, the virtual machine image inspector."
-msgstr "L<virt-inspector(1)>, the virtual machine image inspector."
+msgid "L<virt-get-kernel(1)> command and documentation."
+msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:248
-msgid "F<lib>"
+msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:250
+msgid ""
+"Gnulib is used as a portability library.  A copy of gnulib is included under "
+"here."
+msgstr ""
+"Gnulib is used as a portability library.  A copy of gnulib is included under "
+"here."
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:253
+msgid "F<inspector>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:255
+msgid "L<virt-inspector(1)>, the virtual machine image inspector."
+msgstr "L<virt-inspector(1)>, the virtual machine image inspector."
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:257
+msgid "F<lib>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr "Source code to the C library."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr "Logo used on the website.  The fish is called Arthur by the way."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr "Translations of simple gettext strings."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -17915,72 +17941,72 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr "L<virt-rescue(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr "L<virt-resize(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr "L<virt-sparsify(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr "L<virt-sysprep(1)> command and documentation."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr "Tests."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
@@ -17989,12 +18015,12 @@ msgstr ""
 "with libguestfs."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -18002,125 +18028,125 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr "Language bindings."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -18129,14 +18155,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -18144,12 +18170,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -18157,17 +18183,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr "EXTENDING LIBGUESTFS"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
@@ -18176,12 +18202,12 @@ msgstr ""
 "makes it easy to extend the libguestfs API."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr "To add a new API action there are two changes:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -18189,7 +18215,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -18201,7 +18227,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -18216,7 +18242,7 @@ msgstr ""
 "increment it."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -18231,12 +18257,12 @@ msgstr ""
 "to C<-1>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr "Implement the action (in C):"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
@@ -18245,19 +18271,19 @@ msgstr ""
 "C<daemon/> directory."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr "In either case, use another function as an example of what to do."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -18265,12 +18291,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr "After making these changes, use C<make> to compile."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -18278,12 +18304,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -18293,61 +18319,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr "The test environment has 4 block devices:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr "General block device for testing."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr "Used in a few tests where two block devices are needed."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -18355,7 +18381,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -18365,7 +18391,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -18380,7 +18406,7 @@ msgstr ""
 "unconditionally."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
@@ -18389,7 +18415,7 @@ msgstr ""
 "variables before running C<make check>."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -18399,13 +18425,13 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -18415,18 +18441,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr "Packagers can run only certain tests by setting for example:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -18436,29 +18462,29 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr "Test new actions work before submitting them."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr "You can use guestfish to try out new commands."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -18469,31 +18495,31 @@ msgstr ""
 "they will show up if you use C<guestfish -v>."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr "ADDING A NEW LANGUAGE BINDING"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -18504,7 +18530,7 @@ msgstr ""
 "tests that every language binding should use."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -18515,12 +18541,12 @@ msgstr ""
 "the OCaml tests do."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr "This is the numbering scheme used by the tests:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -18530,7 +18556,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -18547,7 +18573,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -18557,7 +18583,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -18567,7 +18593,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -18581,7 +18607,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -18591,7 +18617,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -18601,7 +18627,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
@@ -18610,12 +18636,12 @@ msgstr ""
 "the handle."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr "FORMATTING CODE"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -18630,14 +18656,14 @@ msgstr ""
 "indentation level, and other than that, follow the K&R style."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -18663,7 +18689,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -18693,18 +18719,18 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr "TESTING YOUR CHANGES"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -18712,22 +18738,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr "Useful targets are:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr "C<make check>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr "Runs the regular test suite."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
@@ -18736,27 +18762,27 @@ msgstr ""
 "automake documentation for details."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr "C<make check-valgrind>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr "Runs a subset of the test suite under valgrind."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr "C<make check-valgrind-local-guests>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
@@ -18765,12 +18791,12 @@ msgstr ""
 "libvirt guests (read-only)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -18781,12 +18807,12 @@ msgstr ""
 "backend=...>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
@@ -18795,24 +18821,24 @@ msgstr ""
 "back-end."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -18820,27 +18846,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr "C<make check-with-upstream-qemu>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -18848,7 +18874,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -18858,12 +18884,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr "C<make check-with-upstream-libvirt>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -18874,14 +18900,14 @@ msgstr ""
 "backend=libvirt>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -18891,29 +18917,29 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr "C<make check-slow>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr "Runs some slow/long-running tests which are not run by default."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -18921,18 +18947,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -18941,12 +18967,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -18954,12 +18980,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -18967,13 +18993,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -18982,22 +19008,22 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr "C<make check-all>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr "C<make check-release>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
@@ -19006,54 +19032,54 @@ msgstr ""
 "tarball can be released.  Currently this is:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr "check"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr "check-valgrind"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr "check-direct"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr "check-valgrind-direct"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr "check-slow"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -19064,32 +19090,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -19097,12 +19123,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -19111,14 +19137,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -19126,19 +19152,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
@@ -19147,19 +19173,19 @@ msgstr ""
 "libguestfs> and CC to L<rjones@redhat.com>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr "DAEMON CUSTOM PRINTF FORMATTERS"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
@@ -19168,12 +19194,12 @@ msgstr ""
 "which are used to do shell quoting."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr "%Q"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
@@ -19182,12 +19208,12 @@ msgstr ""
 "escaped for you."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr "%R"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
@@ -19196,7 +19222,7 @@ msgstr ""
 "the sysroot."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -19206,12 +19232,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -19224,17 +19250,17 @@ msgstr ""
 "probably want to use the C<sysroot_path()> function however."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr "INTERNATIONALISATION (I18N) SUPPORT"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr "We support i18n (gettext anyhow) in the library."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -19243,7 +19269,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
@@ -19252,24 +19278,24 @@ msgstr ""
 "programmers."
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -19279,12 +19305,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -19292,14 +19318,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -19307,14 +19333,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -19322,7 +19348,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -19331,7 +19357,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -19340,48 +19366,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -19390,7 +19416,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -19400,22 +19426,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -19423,7 +19449,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -19433,7 +19459,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -19441,29 +19467,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -19471,19 +19497,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -19491,7 +19517,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -19499,31 +19525,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -19532,12 +19558,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -19545,12 +19571,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr "MAKING A STABLE RELEASE"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -19558,63 +19584,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr "Run:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -19622,12 +19648,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -19635,17 +19661,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr "Consider updating gnulib to latest upstream version."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
@@ -19654,19 +19680,19 @@ msgstr ""
 "download>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -19679,12 +19705,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -19693,50 +19719,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/es.po b/po-docs/es.po
index 994f1790e..743dd8b84 100644
--- a/po-docs/es.po
+++ b/po-docs/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2018-03-12 09:56+0000\n"
 "Last-Translator: Javier Blanco <javi.deb@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -600,7 +600,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1198,41 +1198,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1446,7 +1447,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1535,7 +1536,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1834,7 +1835,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1858,7 +1859,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1880,7 +1881,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3243,7 +3244,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3269,7 +3270,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3295,7 +3296,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8486,13 +8487,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8520,7 +8521,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8532,10 +8533,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8543,10 +8544,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8557,10 +8558,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8571,10 +8572,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8584,12 +8585,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8597,12 +8599,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8611,7 +8614,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8619,7 +8622,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8629,13 +8632,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8645,13 +8648,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8661,18 +8664,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8680,19 +8683,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8700,7 +8703,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8711,7 +8714,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8721,7 +8724,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8731,7 +8734,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8739,32 +8742,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8772,12 +8777,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8785,7 +8790,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8794,7 +8799,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8803,24 +8808,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8828,24 +8833,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8853,13 +8858,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8867,8 +8872,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8877,8 +8882,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8887,20 +8892,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8908,12 +8913,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8922,8 +8927,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8932,12 +8937,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8945,12 +8950,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8959,18 +8964,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8978,18 +8983,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8997,23 +9002,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9022,18 +9027,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9041,8 +9046,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9051,12 +9056,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9064,7 +9069,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9072,7 +9077,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9080,7 +9085,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9089,7 +9094,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9099,18 +9104,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9118,12 +9123,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9132,14 +9137,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9151,7 +9156,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9159,20 +9164,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9180,7 +9185,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9188,41 +9193,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9231,25 +9236,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9258,63 +9263,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9322,14 +9327,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9337,12 +9342,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9350,23 +9355,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9374,24 +9379,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9401,18 +9406,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9421,18 +9426,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9441,7 +9446,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9449,7 +9454,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9458,18 +9463,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12782,7 +12787,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16437,284 +16442,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16722,127 +16748,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16850,84 +16876,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16935,124 +16961,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17061,14 +17087,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17076,12 +17102,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17089,29 +17115,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17119,7 +17145,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17131,7 +17157,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17141,7 +17167,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17151,31 +17177,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17183,12 +17209,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17196,12 +17222,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17211,61 +17237,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17273,7 +17299,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17283,7 +17309,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17293,14 +17319,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17308,13 +17334,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17322,18 +17348,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17341,29 +17367,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17371,31 +17397,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17403,7 +17429,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17411,12 +17437,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17424,7 +17450,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17441,7 +17467,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17449,7 +17475,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17457,7 +17483,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17467,7 +17493,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17475,7 +17501,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17483,19 +17509,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17505,14 +17531,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17528,7 +17554,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17546,18 +17572,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17565,61 +17591,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17627,36 +17653,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17664,27 +17690,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17692,7 +17718,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17700,12 +17726,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17713,14 +17739,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17728,29 +17754,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17758,18 +17784,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17778,12 +17804,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17791,12 +17817,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17804,13 +17830,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17819,76 +17845,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17899,32 +17925,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17932,12 +17958,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17946,14 +17972,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17961,69 +17987,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18031,12 +18057,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18045,17 +18071,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18064,31 +18090,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18098,12 +18124,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18111,14 +18137,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18126,14 +18152,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18141,7 +18167,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18150,7 +18176,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18159,48 +18185,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18209,7 +18235,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18219,22 +18245,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18242,7 +18268,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18252,7 +18278,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18260,29 +18286,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18290,19 +18316,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18310,7 +18336,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18318,31 +18344,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18351,12 +18377,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18364,12 +18390,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18377,63 +18403,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18441,12 +18467,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18454,36 +18480,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18496,12 +18522,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18510,50 +18536,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/eu.po b/po-docs/eu.po
index c8397759e..06763ec31 100644
--- a/po-docs/eu.po
+++ b/po-docs/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:17+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -596,7 +596,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1177,41 +1177,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1425,7 +1426,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1514,7 +1515,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1809,7 +1810,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1833,7 +1834,7 @@ msgstr "EGILEAK"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1855,7 +1856,7 @@ msgstr "Richard W.M. Jones (C<rjones abildua redhat puntu com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3212,7 +3213,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3238,7 +3239,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3264,7 +3265,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8455,13 +8456,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8489,7 +8490,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8501,10 +8502,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8512,10 +8513,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8526,10 +8527,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8540,10 +8541,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8553,12 +8554,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8566,12 +8568,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8580,7 +8583,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8588,7 +8591,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8598,13 +8601,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8614,13 +8617,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8630,18 +8633,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8649,19 +8652,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8669,7 +8672,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8680,7 +8683,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8690,7 +8693,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8700,7 +8703,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8708,32 +8711,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8741,12 +8746,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8754,7 +8759,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8763,7 +8768,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8772,24 +8777,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8797,24 +8802,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8822,13 +8827,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8836,8 +8841,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8846,8 +8851,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8856,20 +8861,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8877,12 +8882,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8891,8 +8896,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8901,12 +8906,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8914,12 +8919,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8928,18 +8933,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8947,18 +8952,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8966,23 +8971,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -8991,18 +8996,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9010,8 +9015,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9020,12 +9025,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9033,7 +9038,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9041,7 +9046,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9049,7 +9054,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9058,7 +9063,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9068,18 +9073,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9087,12 +9092,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9101,14 +9106,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9120,7 +9125,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9128,20 +9133,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9149,7 +9154,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9157,41 +9162,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9200,25 +9205,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9227,63 +9232,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9291,14 +9296,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9306,12 +9311,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9319,23 +9324,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9343,24 +9348,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9370,18 +9375,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9390,18 +9395,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9410,7 +9415,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9418,7 +9423,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9427,18 +9432,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12750,7 +12755,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16405,284 +16410,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16690,127 +16716,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16818,84 +16844,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16903,124 +16929,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17029,14 +17055,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17044,12 +17070,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17057,29 +17083,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17087,7 +17113,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17099,7 +17125,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17109,7 +17135,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17119,31 +17145,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17151,12 +17177,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17164,12 +17190,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17179,61 +17205,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17241,7 +17267,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17251,7 +17277,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17261,14 +17287,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17276,13 +17302,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17290,18 +17316,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17309,29 +17335,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17339,31 +17365,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17371,7 +17397,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17379,12 +17405,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17392,7 +17418,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17409,7 +17435,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17417,7 +17443,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17425,7 +17451,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17435,7 +17461,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17443,7 +17469,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17451,19 +17477,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17473,14 +17499,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17496,7 +17522,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17514,18 +17540,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17533,61 +17559,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17595,36 +17621,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17632,27 +17658,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17660,7 +17686,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17668,12 +17694,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17681,14 +17707,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17696,29 +17722,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17726,18 +17752,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17746,12 +17772,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17759,12 +17785,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17772,13 +17798,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17787,76 +17813,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17867,32 +17893,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17900,12 +17926,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17914,14 +17940,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17929,69 +17955,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr "%Q"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr "%R"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -17999,12 +18025,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18013,17 +18039,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18032,31 +18058,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18066,12 +18092,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18079,14 +18105,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18094,14 +18120,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18109,7 +18135,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18118,7 +18144,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18127,48 +18153,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18177,7 +18203,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18187,22 +18213,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18210,7 +18236,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18220,7 +18246,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18228,29 +18254,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18258,19 +18284,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18278,7 +18304,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18286,31 +18312,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18319,12 +18345,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18332,12 +18358,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18345,63 +18371,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18409,12 +18435,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18422,36 +18448,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18464,12 +18490,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18478,50 +18504,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/fr.po b/po-docs/fr.po
index 8a3ceb7ef..7d5db310c 100644
--- a/po-docs/fr.po
+++ b/po-docs/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:19+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -625,7 +625,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1241,41 +1241,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1489,7 +1490,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1578,7 +1579,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1893,7 +1894,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1917,7 +1918,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1939,7 +1940,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3319,7 +3320,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3345,7 +3346,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3371,7 +3372,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8732,13 +8733,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8766,7 +8767,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8778,10 +8779,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8789,10 +8790,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8803,10 +8804,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8817,10 +8818,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8830,12 +8831,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8843,12 +8845,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8857,7 +8860,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8865,7 +8868,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8875,13 +8878,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8891,13 +8894,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8907,18 +8910,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8926,19 +8929,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8946,7 +8949,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8957,7 +8960,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8967,7 +8970,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8977,7 +8980,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8985,32 +8988,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -9018,12 +9023,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -9031,7 +9036,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -9040,7 +9045,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -9049,24 +9054,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -9074,24 +9079,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -9099,13 +9104,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -9113,8 +9118,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -9123,8 +9128,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -9133,20 +9138,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -9154,12 +9159,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9168,8 +9173,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -9178,12 +9183,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -9191,12 +9196,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9205,18 +9210,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -9224,18 +9229,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -9243,23 +9248,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9268,18 +9273,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9287,8 +9292,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9297,12 +9302,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9310,7 +9315,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9318,7 +9323,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9326,7 +9331,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9335,7 +9340,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9345,18 +9350,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9364,12 +9369,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9378,14 +9383,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9397,7 +9402,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9405,20 +9410,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9426,7 +9431,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9434,41 +9439,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9477,25 +9482,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9504,63 +9509,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9568,14 +9573,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9583,12 +9588,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9596,23 +9601,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9620,24 +9625,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9647,18 +9652,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9667,18 +9672,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9687,7 +9692,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9695,7 +9700,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9704,18 +9709,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -13062,7 +13067,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16803,284 +16808,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -17088,127 +17114,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -17216,84 +17242,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -17301,124 +17327,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17427,14 +17453,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17442,12 +17468,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17455,29 +17481,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17485,7 +17511,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17497,7 +17523,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17507,7 +17533,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17517,31 +17543,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17549,12 +17575,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17562,12 +17588,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17577,61 +17603,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17639,7 +17665,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17649,7 +17675,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17659,14 +17685,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17676,13 +17702,13 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17692,18 +17718,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17713,29 +17739,29 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17743,31 +17769,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17775,7 +17801,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17783,12 +17809,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17798,7 +17824,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17815,7 +17841,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17825,7 +17851,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17835,7 +17861,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17849,7 +17875,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17859,7 +17885,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17869,19 +17895,19 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17891,14 +17917,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17924,7 +17950,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17954,18 +17980,18 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17973,61 +17999,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr "C<make check>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr "C<make check-valgrind>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr "C<make check-valgrind-local-guests>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr "C<make check-direct>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -18035,36 +18061,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr "C<make check-valgrind-direct>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr "C<make check-uml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -18074,27 +18100,27 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr "C<make check-valgrind-uml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr "C<make check-with-upstream-qemu>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -18102,7 +18128,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -18112,12 +18138,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr "C<make check-with-upstream-libvirt>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -18125,14 +18151,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -18142,29 +18168,29 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr "C<make check-slow>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -18172,18 +18198,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -18192,12 +18218,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -18205,12 +18231,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -18218,13 +18244,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -18233,76 +18259,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr "C<make check-all>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr "C<make check-release>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -18313,32 +18339,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -18346,12 +18372,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -18360,14 +18386,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -18375,69 +18401,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18447,12 +18473,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18461,17 +18487,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18480,31 +18506,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18514,12 +18540,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18527,14 +18553,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18542,14 +18568,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18557,7 +18583,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18566,7 +18592,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18575,48 +18601,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18625,7 +18651,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18635,22 +18661,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18658,7 +18684,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18668,7 +18694,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18676,29 +18702,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18706,19 +18732,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18726,7 +18752,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18734,31 +18760,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18767,12 +18793,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18780,12 +18806,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18793,63 +18819,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18857,12 +18883,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18870,36 +18896,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18912,12 +18938,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18926,50 +18952,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/ja.po b/po-docs/ja.po
index d86cccfe2..ac4702caa 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-02-24 07:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -671,7 +671,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1337,41 +1337,42 @@ msgstr "このプログラムは以下を返します:"
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1591,7 +1592,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1682,7 +1683,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -2016,7 +2017,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -2040,7 +2041,7 @@ msgstr "著者"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -2062,7 +2063,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3421,7 +3422,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3447,7 +3448,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3473,7 +3474,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8908,13 +8909,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8942,7 +8943,7 @@ msgid "comment"
 msgstr "コメント"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8954,10 +8955,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8965,10 +8966,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8979,10 +8980,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8993,10 +8994,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -9006,12 +9007,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -9019,12 +9021,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -9033,7 +9036,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -9041,7 +9044,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -9051,13 +9054,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -9067,13 +9070,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -9083,18 +9086,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -9102,19 +9105,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -9122,7 +9125,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -9133,7 +9136,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -9143,7 +9146,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -9153,7 +9156,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -9161,32 +9164,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -9194,12 +9199,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -9207,7 +9212,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -9216,7 +9221,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -9225,24 +9230,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -9252,7 +9257,7 @@ msgstr ""
 "ください。"
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
@@ -9260,18 +9265,18 @@ msgstr ""
 "注意してください。"
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -9279,13 +9284,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -9293,8 +9298,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -9303,8 +9308,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -9313,20 +9318,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -9334,12 +9339,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9348,8 +9353,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -9358,12 +9363,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -9371,12 +9376,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -9385,18 +9390,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -9404,18 +9409,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -9423,23 +9428,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -9448,18 +9453,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9467,8 +9472,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9477,12 +9482,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9490,7 +9495,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9498,7 +9503,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9506,7 +9511,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9515,7 +9520,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9525,18 +9530,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9544,12 +9549,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9558,14 +9563,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9577,7 +9582,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9585,20 +9590,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9606,7 +9611,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9614,41 +9619,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9657,25 +9662,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9684,63 +9689,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9748,14 +9753,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9763,12 +9768,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9776,23 +9781,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9800,24 +9805,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9827,18 +9832,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9847,18 +9852,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9867,7 +9872,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9875,7 +9880,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9884,18 +9889,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -13260,7 +13265,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -17001,285 +17006,306 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr "外部の貢献、実験的な部分です。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 "libguestfs アプライアンスの中で実行され、アクションを実行しているデーモン。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr "L<virt-df(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr "L<virt-edit(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr "C API のコード例。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -17290,22 +17316,22 @@ msgstr ""
 "プト。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr "L<virt-format(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
@@ -17313,34 +17339,34 @@ msgstr ""
 "システム)。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
@@ -17349,72 +17375,72 @@ msgstr ""
 "含まれます。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr "L<virt-inspector(1)>, 仮想マシンイメージ検査ツール。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr "C ライブラリーのソースコード。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr "シンプルな gettext 文字列の翻訳。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -17422,72 +17448,72 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr "L<virt-rescue(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr "L<virt-resize(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr "L<virt-sparsify(1)> のコマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr "L<virt-sysprep(1)> コマンドおよびドキュメント。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr "テストします。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
@@ -17496,12 +17522,12 @@ msgstr ""
 "確認するためのテストツールです。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -17509,12 +17535,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
@@ -17522,113 +17548,113 @@ msgstr ""
 "の)。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr "言語バインディング。"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17637,14 +17663,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17652,12 +17678,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17665,29 +17691,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17695,7 +17721,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17707,7 +17733,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17717,7 +17743,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17727,31 +17753,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17759,13 +17785,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 "これらの変更をした後、コンパイルするために C<make> を使用してください。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17773,12 +17799,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17788,62 +17814,62 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr "テスト環境は 4 個のブロックデバイスを持ちます:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr "テスト用の一般的なブロックデバイス。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 "2 つのブロックデバイスが必要となるいくつかのテストにおいて使用されます。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17851,7 +17877,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17861,7 +17887,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17871,14 +17897,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17888,13 +17914,13 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17904,18 +17930,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17925,29 +17951,29 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr "新しいコマンドを試すために guestfish を使うことができます。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17955,31 +17981,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17987,7 +18013,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17995,12 +18021,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -18008,7 +18034,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -18025,7 +18051,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -18033,7 +18059,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -18041,7 +18067,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -18051,7 +18077,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -18059,7 +18085,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -18067,19 +18093,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -18089,14 +18115,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -18122,7 +18148,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -18152,18 +18178,18 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr "変更のテスト方法"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -18171,49 +18197,49 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr "有用なターゲットは次のとおりです:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr "C<make check>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr "一般的なテスト群を実行します。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr "C<make check-valgrind>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr "valgrind にあるテスト群のサブセットを実行します。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr "C<make check-valgrind-local-guests>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
@@ -18222,12 +18248,12 @@ msgstr ""
 "valgrind にあるテスト群のサブセットを実行します。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -18235,36 +18261,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -18272,27 +18298,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr "C<make check-with-upstream-qemu>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -18300,7 +18326,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -18310,12 +18336,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr "C<make check-with-upstream-libvirt>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -18323,14 +18349,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -18340,29 +18366,29 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr "C<make check-slow>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -18370,18 +18396,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -18390,12 +18416,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -18403,12 +18429,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -18416,13 +18442,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -18431,76 +18457,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -18511,32 +18537,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -18544,12 +18570,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -18558,14 +18584,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -18573,19 +18599,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
@@ -18594,31 +18620,31 @@ msgstr ""
 "listinfo/libguestfs> および L<rjones@redhat.com> (Cc)。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr "%Q"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
@@ -18627,19 +18653,19 @@ msgstr ""
 "ます。"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr "%R"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18649,12 +18675,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr "C<cat /sysroot/some\\ path\\ with\\ spaces> を生成します"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18663,17 +18689,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr "国際化 (i18n) サポート"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18682,31 +18708,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18716,12 +18742,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18729,14 +18755,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18744,14 +18770,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18759,7 +18785,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18768,7 +18794,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18777,48 +18803,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18827,7 +18853,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18837,22 +18863,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18860,7 +18886,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18870,7 +18896,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18878,29 +18904,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18908,19 +18934,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18928,7 +18954,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18936,31 +18962,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18969,12 +18995,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18982,12 +19008,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18995,63 +19021,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr "次を実行します:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -19059,12 +19085,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -19072,17 +19098,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
@@ -19091,19 +19117,19 @@ msgstr ""
 "リーを作成します。"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -19116,12 +19142,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -19130,50 +19156,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 9969c61ca..da55f7b3c 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.41.5\n"
+"Project-Id-Version: libguestfs 1.41.6\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 13:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -358,7 +358,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:150 ../builder/virt-builder.pod:150 ../cat/virt-cat.pod:109 ../cat/virt-filesystems.pod:183 ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111 ../customize/virt-customize.pod:126 ../df/virt-df.pod:128 ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481 ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508 ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141 ../fish/guestfish.pod:236 ../fish/guestfish.pod:720 ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363 ../rescue/virt-rescue.pod:164 ../sysprep/virt-sysprep.pod:174 ../sysprep/virt-sysprep.pod:242 ../v2v/virt-v2v-output-openstack.pod:95
+#: ../align/virt-alignment-scan.pod:150 ../builder/virt-builder.pod:150 ../cat/virt-cat.pod:109 ../cat/virt-filesystems.pod:183 ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111 ../customize/virt-customize.pod:126 ../df/virt-df.pod:128 ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481 ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508 ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141 ../fish/guestfish.pod:236 ../fish/guestfish.pod:720 ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363 ../rescue/virt-rescue.pod:164 ../sysprep/virt-sysprep.pod:174 ../sysprep/virt-sysprep.pod:242 ../v2v/virt-v2v-output-openstack.pod:95
 msgid "For example:"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgid "This program returns:"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:934 ../builder/virt-builder.pod:941 ../builder/virt-builder.pod:945 ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:954 ../builder/virt-builder.pod:958 ../builder/virt-builder.pod:962 ../builder/virt-builder.pod:967 ../builder/virt-builder.pod:1142 ../builder/virt-builder.pod:1147 ../builder/virt-builder.pod:1720 ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1728 ../builder/virt-index-validate.pod:32 ../builder/virt-index-validate.pod:37 ../builder/virt-index-validate.pod:51 ../builder/virt-index-validate.pod:56 ../cat/virt-cat.pod:233 ../cat/virt-cat.pod:238 ../cat/virt-cat.pod:243 ../cat/virt-cat.pod:254 ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29 ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222 ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242 ../customize/customize-options.pod:290 ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688 ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700 ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724 ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735 ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759 ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767 ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915 ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926 ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957 ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049 ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057 ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075 ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103 ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378 ../docs/guestfs-release-notes.pod:2383 ../docs/guestfs-release-notes.pod:4279 ../docs/guestfs-release-notes.pod:4284 ../docs/guestfs-release-notes.pod:4755 ../docs/guestfs-release-notes.pod:4759 ../docs/guestfs-release-notes.pod:4763 ../docs/guestfs-release-notes.pod:4767 ../docs/guestfs-release-notes.pod:4771 ../docs/guestfs-release-notes.pod:4775 ../docs/guestfs-release-notes.pod:4779 ../docs/guestfs-release-notes.pod:4784 ../docs/guestfs-release-notes.pod:4788 ../docs/guestfs-release-notes.pod:5113 ../docs/guestfs-release-notes.pod:5117 ../docs/guestfs-release-notes.pod:5121 ../docs/guestfs-release-notes.pod:5183 ../docs/guestfs-release-notes.pod:5187 ../docs/guestfs-release-notes.pod:5191 ../docs/guestfs-release-notes.pod:5195 ../docs/guestfs-release-notes.pod:5199 ../docs/guestfs-release-notes.pod:5203 ../docs/guestfs-release-notes.pod:5208 ../docs/guestfs-release-notes.pod:5212 ../docs/guestfs-release-notes.pod:5216 ../docs/guestfs-release-notes.pod:5220 ../docs/guestfs-release-notes.pod:5416 ../docs/guestfs-release-notes.pod:5421 ../docs/guestfs-release-notes.pod:5426 ../docs/guestfs-security.pod:81 ../docs/guestfs-security.pod:85 ../docs/guestfs-security.pod:89 ../docs/guestfs-security.pod:93 ../docs/guestfs-security.pod:97 ../docs/guestfs-security.pod:101 ../docs/guestfs-security.pod:311 ../docs/guestfs-security.pod:316 ../docs/guestfs-testing.pod:62 ../docs/guestfs-testing.pod:69 ../docs/guestfs-testing.pod:80 ../docs/guestfs-testing.pod:86 ../docs/guestfs-testing.pod:194 ../docs/guestfs-testing.pod:198 ../docs/guestfs-testing.pod:202 ../docs/internal-documentation.pod:41 ../docs/internal-documentation.pod:46 ../docs/internal-documentation.pod:1399 ../docs/internal-documentation.pod:1403 ../docs/internal-documentation.pod:1620 ../docs/internal-documentation.pod:1624 ../docs/internal-documentation.pod:2550 ../docs/internal-documentation.pod:2558 ../docs/internal-documentation.pod:2564 ../docs/internal-documentation.pod:2571 ../docs/internal-documentation.pod:2829 ../docs/internal-documentation.pod:2836 ../docs/internal-documentation.pod:2840 ../docs/internal-documentation.pod:2869 ../docs/internal-documentation.pod:2876 ../docs/internal-documentation.pod:2880 ../docs/internal-documentation.pod:2911 ../docs/internal-documentation.pod:2916 ../docs/internal-documentation.pod:2923 ../docs/internal-documentation.pod:3096 ../docs/internal-documentation.pod:3101 ../docs/internal-documentation.pod:3217 ../docs/internal-documentation.pod:3221 ../docs/internal-documentation.pod:3440 ../docs/internal-documentation.pod:3444 ../docs/internal-documentation.pod:3448 ../docs/internal-documentation.pod:3453 ../docs/internal-documentation.pod:4003 ../docs/internal-documentation.pod:4008 ../edit/virt-edit.pod:319 ../edit/virt-edit.pod:324 ../edit/virt-edit.pod:329 ../edit/virt-edit.pod:340 ../edit/virt-edit.pod:344 ../fish/guestfish-actions.pod:772 ../fish/guestfish-actions.pod:778 ../fish/guestfish-actions.pod:786 ../fish/guestfish-actions.pod:793 ../fish/guestfish-actions.pod:800 ../fish/guestfish-actions.pod:2528 ../fish/guestfish-actions.pod:2532 ../fish/guestfish-actions.pod:2536 ../fish/guestfish-actions.pod:2540 ../fish/guestfish-actions.pod:2548 ../fish/guestfish-actions.pod:2552 ../fish/guestfish-actions.pod:2556 ../fish/guestfish-actions.pod:2566 ../fish/guestfish-actions.pod:2570 ../fish/guestfish-actions.pod:2574 ../fish/guestfish-actions.pod:2836 ../fish/guestfish-actions.pod:2840 ../fish/guestfish-actions.pod:2845 ../fish/guestfish-actions.pod:2899 ../fish/guestfish-actions.pod:2903 ../fish/guestfish-actions.pod:2908 ../fish/guestfish-actions.pod:3532 ../fish/guestfish-actions.pod:3539 ../fish/guestfish-actions.pod:3546 ../fish/guestfish-actions.pod:4278 ../fish/guestfish-actions.pod:4284 ../fish/guestfish-actions.pod:4292 ../fish/guestfish-actions.pod:4299 ../fish/guestfish-actions.pod:4306 ../fish/guestfish.pod:493 ../fish/guestfish.pod:497 ../fish/guestfish.pod:501 ../fish/guestfish.pod:505 ../fish/guestfish.pod:1359 ../fish/guestfish.pod:1365 ../fish/libguestfs-tools.conf.pod:22 ../fish/libguestfs-tools.conf.pod:26 ../fish/libguestfs-tools.conf.pod:30 ../fish/libguestfs-tools.conf.pod:60 ../fish/libguestfs-tools.conf.pod:65 ../fish/libguestfs-tools.conf.pod:69 ../fish/libguestfs-tools.conf.pod:75 ../golang/examples/guestfs-golang.pod:58 ../golang/examples/guestfs-golang.pod:62 ../inspector/virt-inspector.pod:520 ../inspector/virt-inspector.pod:524 ../lib/guestfs-actions.pod:1174 ../lib/guestfs-actions.pod:1180 ../lib/guestfs-actions.pod:1188 ../lib/guestfs-actions.pod:1195 ../lib/guestfs-actions.pod:1202 ../lib/guestfs-actions.pod:4342 ../lib/guestfs-actions.pod:4346 ../lib/guestfs-actions.pod:4350 ../lib/guestfs-actions.pod:4354 ../lib/guestfs-actions.pod:4362 ../lib/guestfs-actions.pod:4366 ../lib/guestfs-actions.pod:4370 ../lib/guestfs-actions.pod:4380 ../lib/guestfs-actions.pod:4384 ../lib/guestfs-actions.pod:4388 ../lib/guestfs-actions.pod:4724 ../lib/guestfs-actions.pod:4728 ../lib/guestfs-actions.pod:4733 ../lib/guestfs-actions.pod:4820 ../lib/guestfs-actions.pod:4824 ../lib/guestfs-actions.pod:4829 ../lib/guestfs-actions.pod:5838 ../lib/guestfs-actions.pod:5845 ../lib/guestfs-actions.pod:5852 ../lib/guestfs-actions.pod:6881 ../lib/guestfs-actions.pod:6887 ../lib/guestfs-actions.pod:6895 ../lib/guestfs-actions.pod:6902 ../lib/guestfs-actions.pod:6909 ../lib/guestfs.pod:436 ../lib/guestfs.pod:441 ../lib/guestfs.pod:446 ../lib/guestfs.pod:450 ../lib/guestfs.pod:455 ../lib/guestfs.pod:459 ../lib/guestfs.pod:464 ../lib/guestfs.pod:469 ../lib/guestfs.pod:799 ../lib/guestfs.pod:806 ../lib/guestfs.pod:812 ../lib/guestfs.pod:818 ../lib/guestfs.pod:824 ../lib/guestfs.pod:829 ../lib/guestfs.pod:835 ../lib/guestfs.pod:1054 ../lib/guestfs.pod:1058 ../lib/guestfs.pod:1064 ../lib/guestfs.pod:1149 ../lib/guestfs.pod:1154 ../lib/guestfs.pod:1158 ../lib/guestfs.pod:1164 ../lib/guestfs.pod:1168 ../lib/guestfs.pod:1172 ../lib/guestfs.pod:1177 ../lib/guestfs.pod:1738 ../lib/guestfs.pod:1743 ../lib/guestfs.pod:1747 ../lib/guestfs.pod:2382 ../lib/guestfs.pod:2387 ../lib/guestfs.pod:2391 ../lib/guestfs.pod:2495 ../lib/guestfs.pod:2500 ../lib/guestfs.pod:2504 ../lib/guestfs.pod:2514 ../lib/guestfs.pod:2945 ../lib/guestfs.pod:2950 ../lib/guestfs.pod:2956 ../lib/guestfs.pod:2964 ../lib/guestfs.pod:3121 ../lib/guestfs.pod:3127 ../lib/guestfs.pod:3132 ../lib/guestfs.pod:3138 ../resize/virt-resize.pod:376 ../resize/virt-resize.pod:380 ../resize/virt-resize.pod:389 ../resize/virt-resize.pod:395 ../resize/virt-resize.pod:399 ../resize/virt-resize.pod:403 ../resize/virt-resize.pod:411 ../sparsify/virt-sparsify.pod:46 ../sparsify/virt-sparsify.pod:50 ../sparsify/virt-sparsify.pod:59 ../sparsify/virt-sparsify.pod:64 ../sparsify/virt-sparsify.pod:69 ../sparsify/virt-sparsify.pod:75 ../sparsify/virt-sparsify.pod:137 ../sparsify/virt-sparsify.pod:141 ../sparsify/virt-sparsify.pod:145 ../sparsify/virt-sparsify.pod:150 ../sparsify/virt-sparsify.pod:307 ../sparsify/virt-sparsify.pod:312 ../sparsify/virt-sparsify.pod:317 ../sysprep/sysprep-extra-options.pod:334 ../sysprep/sysprep-extra-options.pod:338 ../sysprep/virt-sysprep.pod:339 ../sysprep/virt-sysprep.pod:343 ../sysprep/virt-sysprep.pod:347 ../sysprep/virt-sysprep.pod:351 ../sysprep/virt-sysprep.pod:366 ../sysprep/virt-sysprep.pod:370 ../sysprep/virt-sysprep.pod:374 ../sysprep/virt-sysprep.pod:378 ../sysprep/virt-sysprep.pod:382 ../sysprep/virt-sysprep.pod:435 ../sysprep/virt-sysprep.pod:447 ../sysprep/virt-sysprep.pod:451 ../sysprep/virt-sysprep.pod:459 ../sysprep/virt-sysprep.pod:465 ../tools/virt-win-reg:194 ../tools/virt-win-reg:199 ../tools/virt-win-reg:205 ../tools/virt-win-reg:773 ../tools/virt-win-reg:779 ../tools/virt-win-reg:785 ../v2v/test-harness/virt-v2v-test-harness.pod:175 ../v2v/test-harness/virt-v2v-test-harness.pod:179 ../v2v/test-harness/virt-v2v-test-harness.pod:183 ../v2v/virt-v2v-copy-to-local.pod:29 ../v2v/virt-v2v-input-vmware.pod:446 ../v2v/virt-v2v-input-vmware.pod:450 ../v2v/virt-v2v-input-vmware.pod:454 ../v2v/virt-v2v-input-vmware.pod:458 ../v2v/virt-v2v-input-vmware.pod:462 ../v2v/virt-v2v-output-local.pod:81 ../v2v/virt-v2v-output-local.pod:86 ../v2v/virt-v2v-output-local.pod:91 ../v2v/virt-v2v-output-rhv.pod:118 ../v2v/virt-v2v-output-rhv.pod:123 ../v2v/virt-v2v.pod:177 ../v2v/virt-v2v.pod:181 ../v2v/virt-v2v.pod:186 ../v2v/virt-v2v.pod:190 ../v2v/virt-v2v.pod:194 ../v2v/virt-v2v.pod:713 ../v2v/virt-v2v.pod:718 ../v2v/virt-v2v.pod:723 ../v2v/virt-v2v.pod:727 ../v2v/virt-v2v.pod:1066 ../v2v/virt-v2v.pod:1071 ../v2v/virt-v2v.pod:1082 ../v2v/virt-v2v.pod:1094 ../v2v/virt-v2v.pod:1100 ../v2v/virt-v2v.pod:1105 ../v2v/virt-v2v.pod:1123 ../v2v/virt-v2v.pod:1127
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:934 ../builder/virt-builder.pod:941 ../builder/virt-builder.pod:945 ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:954 ../builder/virt-builder.pod:958 ../builder/virt-builder.pod:962 ../builder/virt-builder.pod:967 ../builder/virt-builder.pod:1142 ../builder/virt-builder.pod:1147 ../builder/virt-builder.pod:1720 ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1728 ../builder/virt-index-validate.pod:32 ../builder/virt-index-validate.pod:37 ../builder/virt-index-validate.pod:51 ../builder/virt-index-validate.pod:56 ../cat/virt-cat.pod:233 ../cat/virt-cat.pod:238 ../cat/virt-cat.pod:243 ../cat/virt-cat.pod:254 ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29 ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222 ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242 ../common/mlcustomize/customize-options.pod:290 ../common/mlcustomize/customize-options.pod:294 ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692 ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704 ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728 ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739 ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764 ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772 ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780 ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928 ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962 ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038 ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062 ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089 ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105 ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116 ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378 ../docs/guestfs-release-notes.pod:2383 ../docs/guestfs-release-notes.pod:4279 ../docs/guestfs-release-notes.pod:4284 ../docs/guestfs-release-notes.pod:4755 ../docs/guestfs-release-notes.pod:4759 ../docs/guestfs-release-notes.pod:4763 ../docs/guestfs-release-notes.pod:4767 ../docs/guestfs-release-notes.pod:4771 ../docs/guestfs-release-notes.pod:4775 ../docs/guestfs-release-notes.pod:4779 ../docs/guestfs-release-notes.pod:4784 ../docs/guestfs-release-notes.pod:4788 ../docs/guestfs-release-notes.pod:5113 ../docs/guestfs-release-notes.pod:5117 ../docs/guestfs-release-notes.pod:5121 ../docs/guestfs-release-notes.pod:5183 ../docs/guestfs-release-notes.pod:5187 ../docs/guestfs-release-notes.pod:5191 ../docs/guestfs-release-notes.pod:5195 ../docs/guestfs-release-notes.pod:5199 ../docs/guestfs-release-notes.pod:5203 ../docs/guestfs-release-notes.pod:5208 ../docs/guestfs-release-notes.pod:5212 ../docs/guestfs-release-notes.pod:5216 ../docs/guestfs-release-notes.pod:5220 ../docs/guestfs-release-notes.pod:5416 ../docs/guestfs-release-notes.pod:5421 ../docs/guestfs-release-notes.pod:5426 ../docs/guestfs-security.pod:81 ../docs/guestfs-security.pod:85 ../docs/guestfs-security.pod:89 ../docs/guestfs-security.pod:93 ../docs/guestfs-security.pod:97 ../docs/guestfs-security.pod:101 ../docs/guestfs-security.pod:311 ../docs/guestfs-security.pod:316 ../docs/guestfs-testing.pod:62 ../docs/guestfs-testing.pod:69 ../docs/guestfs-testing.pod:80 ../docs/guestfs-testing.pod:86 ../docs/guestfs-testing.pod:194 ../docs/guestfs-testing.pod:198 ../docs/guestfs-testing.pod:202 ../docs/internal-documentation.pod:41 ../docs/internal-documentation.pod:46 ../docs/internal-documentation.pod:1399 ../docs/internal-documentation.pod:1403 ../docs/internal-documentation.pod:1620 ../docs/internal-documentation.pod:1624 ../docs/internal-documentation.pod:2550 ../docs/internal-documentation.pod:2558 ../docs/internal-documentation.pod:2564 ../docs/internal-documentation.pod:2571 ../docs/internal-documentation.pod:2829 ../docs/internal-documentation.pod:2836 ../docs/internal-documentation.pod:2840 ../docs/internal-documentation.pod:2869 ../docs/internal-documentation.pod:2876 ../docs/internal-documentation.pod:2880 ../docs/internal-documentation.pod:2911 ../docs/internal-documentation.pod:2916 ../docs/internal-documentation.pod:2923 ../docs/internal-documentation.pod:3096 ../docs/internal-documentation.pod:3101 ../docs/internal-documentation.pod:3217 ../docs/internal-documentation.pod:3221 ../docs/internal-documentation.pod:3440 ../docs/internal-documentation.pod:3444 ../docs/internal-documentation.pod:3448 ../docs/internal-documentation.pod:3453 ../docs/internal-documentation.pod:4003 ../docs/internal-documentation.pod:4008 ../edit/virt-edit.pod:319 ../edit/virt-edit.pod:324 ../edit/virt-edit.pod:329 ../edit/virt-edit.pod:340 ../edit/virt-edit.pod:344 ../fish/guestfish-actions.pod:772 ../fish/guestfish-actions.pod:778 ../fish/guestfish-actions.pod:786 ../fish/guestfish-actions.pod:793 ../fish/guestfish-actions.pod:800 ../fish/guestfish-actions.pod:2528 ../fish/guestfish-actions.pod:2532 ../fish/guestfish-actions.pod:2536 ../fish/guestfish-actions.pod:2540 ../fish/guestfish-actions.pod:2548 ../fish/guestfish-actions.pod:2552 ../fish/guestfish-actions.pod:2556 ../fish/guestfish-actions.pod:2566 ../fish/guestfish-actions.pod:2570 ../fish/guestfish-actions.pod:2574 ../fish/guestfish-actions.pod:2836 ../fish/guestfish-actions.pod:2840 ../fish/guestfish-actions.pod:2845 ../fish/guestfish-actions.pod:2899 ../fish/guestfish-actions.pod:2903 ../fish/guestfish-actions.pod:2908 ../fish/guestfish-actions.pod:3532 ../fish/guestfish-actions.pod:3539 ../fish/guestfish-actions.pod:3546 ../fish/guestfish-actions.pod:4278 ../fish/guestfish-actions.pod:4284 ../fish/guestfish-actions.pod:4292 ../fish/guestfish-actions.pod:4299 ../fish/guestfish-actions.pod:4306 ../fish/guestfish.pod:493 ../fish/guestfish.pod:497 ../fish/guestfish.pod:501 ../fish/guestfish.pod:505 ../fish/guestfish.pod:1359 ../fish/guestfish.pod:1365 ../fish/libguestfs-tools.conf.pod:22 ../fish/libguestfs-tools.conf.pod:26 ../fish/libguestfs-tools.conf.pod:30 ../fish/libguestfs-tools.conf.pod:60 ../fish/libguestfs-tools.conf.pod:65 ../fish/libguestfs-tools.conf.pod:69 ../fish/libguestfs-tools.conf.pod:75 ../golang/examples/guestfs-golang.pod:58 ../golang/examples/guestfs-golang.pod:62 ../inspector/virt-inspector.pod:520 ../inspector/virt-inspector.pod:524 ../lib/guestfs-actions.pod:1174 ../lib/guestfs-actions.pod:1180 ../lib/guestfs-actions.pod:1188 ../lib/guestfs-actions.pod:1195 ../lib/guestfs-actions.pod:1202 ../lib/guestfs-actions.pod:4342 ../lib/guestfs-actions.pod:4346 ../lib/guestfs-actions.pod:4350 ../lib/guestfs-actions.pod:4354 ../lib/guestfs-actions.pod:4362 ../lib/guestfs-actions.pod:4366 ../lib/guestfs-actions.pod:4370 ../lib/guestfs-actions.pod:4380 ../lib/guestfs-actions.pod:4384 ../lib/guestfs-actions.pod:4388 ../lib/guestfs-actions.pod:4724 ../lib/guestfs-actions.pod:4728 ../lib/guestfs-actions.pod:4733 ../lib/guestfs-actions.pod:4820 ../lib/guestfs-actions.pod:4824 ../lib/guestfs-actions.pod:4829 ../lib/guestfs-actions.pod:5838 ../lib/guestfs-actions.pod:5845 ../lib/guestfs-actions.pod:5852 ../lib/guestfs-actions.pod:6881 ../lib/guestfs-actions.pod:6887 ../lib/guestfs-actions.pod:6895 ../lib/guestfs-actions.pod:6902 ../lib/guestfs-actions.pod:6909 ../lib/guestfs.pod:436 ../lib/guestfs.pod:441 ../lib/guestfs.pod:446 ../lib/guestfs.pod:450 ../lib/guestfs.pod:455 ../lib/guestfs.pod:459 ../lib/guestfs.pod:464 ../lib/guestfs.pod:469 ../lib/guestfs.pod:799 ../lib/guestfs.pod:806 ../lib/guestfs.pod:812 ../lib/guestfs.pod:818 ../lib/guestfs.pod:824 ../lib/guestfs.pod:829 ../lib/guestfs.pod:835 ../lib/guestfs.pod:1054 ../lib/guestfs.pod:1058 ../lib/guestfs.pod:1064 ../lib/guestfs.pod:1149 ../lib/guestfs.pod:1154 ../lib/guestfs.pod:1158 ../lib/guestfs.pod:1164 ../lib/guestfs.pod:1168 ../lib/guestfs.pod:1172 ../lib/guestfs.pod:1177 ../lib/guestfs.pod:1738 ../lib/guestfs.pod:1743 ../lib/guestfs.pod:1747 ../lib/guestfs.pod:2382 ../lib/guestfs.pod:2387 ../lib/guestfs.pod:2391 ../lib/guestfs.pod:2495 ../lib/guestfs.pod:2500 ../lib/guestfs.pod:2504 ../lib/guestfs.pod:2514 ../lib/guestfs.pod:2945 ../lib/guestfs.pod:2950 ../lib/guestfs.pod:2956 ../lib/guestfs.pod:2964 ../lib/guestfs.pod:3121 ../lib/guestfs.pod:3127 ../lib/guestfs.pod:3132 ../lib/guestfs.pod:3138 ../resize/virt-resize.pod:376 ../resize/virt-resize.pod:380 ../resize/virt-resize.pod:389 ../resize/virt-resize.pod:395 ../resize/virt-resize.pod:399 ../resize/virt-resize.pod:403 ../resize/virt-resize.pod:411 ../sparsify/virt-sparsify.pod:46 ../sparsify/virt-sparsify.pod:50 ../sparsify/virt-sparsify.pod:59 ../sparsify/virt-sparsify.pod:64 ../sparsify/virt-sparsify.pod:69 ../sparsify/virt-sparsify.pod:75 ../sparsify/virt-sparsify.pod:137 ../sparsify/virt-sparsify.pod:141 ../sparsify/virt-sparsify.pod:145 ../sparsify/virt-sparsify.pod:150 ../sparsify/virt-sparsify.pod:307 ../sparsify/virt-sparsify.pod:312 ../sparsify/virt-sparsify.pod:317 ../sysprep/sysprep-extra-options.pod:334 ../sysprep/sysprep-extra-options.pod:338 ../sysprep/virt-sysprep.pod:339 ../sysprep/virt-sysprep.pod:343 ../sysprep/virt-sysprep.pod:347 ../sysprep/virt-sysprep.pod:351 ../sysprep/virt-sysprep.pod:366 ../sysprep/virt-sysprep.pod:370 ../sysprep/virt-sysprep.pod:374 ../sysprep/virt-sysprep.pod:378 ../sysprep/virt-sysprep.pod:382 ../sysprep/virt-sysprep.pod:435 ../sysprep/virt-sysprep.pod:447 ../sysprep/virt-sysprep.pod:451 ../sysprep/virt-sysprep.pod:459 ../sysprep/virt-sysprep.pod:465 ../tools/virt-win-reg:194 ../tools/virt-win-reg:199 ../tools/virt-win-reg:205 ../tools/virt-win-reg:773 ../tools/virt-win-reg:779 ../tools/virt-win-reg:785 ../v2v/test-harness/virt-v2v-test-harness.pod:175 ../v2v/test-harness/virt-v2v-test-harness.pod:179 ../v2v/test-harness/virt-v2v-test-harness.pod:183 ../v2v/virt-v2v-copy-to-local.pod:29 ../v2v/virt-v2v-input-vmware.pod:446 ../v2v/virt-v2v-input-vmware.pod:450 ../v2v/virt-v2v-input-vmware.pod:454 ../v2v/virt-v2v-input-vmware.pod:458 ../v2v/virt-v2v-input-vmware.pod:462 ../v2v/virt-v2v-output-local.pod:81 ../v2v/virt-v2v-output-local.pod:86 ../v2v/virt-v2v-output-local.pod:91 ../v2v/virt-v2v-output-rhv.pod:118 ../v2v/virt-v2v-output-rhv.pod:123 ../v2v/virt-v2v.pod:177 ../v2v/virt-v2v.pod:181 ../v2v/virt-v2v.pod:186 ../v2v/virt-v2v.pod:190 ../v2v/virt-v2v.pod:194 ../v2v/virt-v2v.pod:713 ../v2v/virt-v2v.pod:718 ../v2v/virt-v2v.pod:723 ../v2v/virt-v2v.pod:727 ../v2v/virt-v2v.pod:1066 ../v2v/virt-v2v.pod:1071 ../v2v/virt-v2v.pod:1082 ../v2v/virt-v2v.pod:1094 ../v2v/virt-v2v.pod:1100 ../v2v/virt-v2v.pod:1105 ../v2v/virt-v2v.pod:1123 ../v2v/virt-v2v.pod:1127
 msgid "*"
 msgstr ""
 
@@ -823,7 +823,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:140 ../builder/virt-builder-repository.pod:201 ../builder/virt-builder.pod:1881 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:292 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:153 ../cat/virt-ls.pod:535 ../cat/virt-tail.pod:253 ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143 ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265 ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411 ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719 ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409 ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../fish/guestfish.pod:1638 ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:42 ../fish/virt-copy-out.pod:37 ../fish/virt-tar-in.pod:39 ../fish/virt-tar-out.pod:39 ../format/virt-format.pod:185 ../fuse/guestmount.pod:443 ../fuse/guestunmount.pod:147 ../get-kernel/virt-get-kernel.pod:205 ../gobject/guestfs-gobject.pod:44 ../golang/examples/guestfs-golang.pod:76 ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:159 ../lib/guestfs.pod:3443 ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215 ../ocaml/examples/guestfs-ocaml.pod:80 ../perl/examples/guestfs-perl.pod:38 ../python/examples/guestfs-python.pod:63 ../rescue/virt-rescue.pod:494 ../resize/virt-resize.pod:842 ../ruby/examples/guestfs-ruby.pod:34 ../sparsify/virt-sparsify.pod:474 ../sysprep/virt-sysprep.pod:616 ../test-tool/libguestfs-test-tool.pod:178 ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263 ../tools/virt-tar:292 ../tools/virt-win-reg:804 ../utils/boot-analysis/boot-analysis.pod:88 ../utils/boot-benchmark/boot-benchmark.pod:57 ../v2v/test-harness/virt-v2v-test-harness.pod:263 ../v2v/virt-v2v-copy-to-local.pod:112 ../v2v/virt-v2v-input-vmware.pod:618 ../v2v/virt-v2v-input-xen.pod:117 ../v2v/virt-v2v-output-local.pod:198 ../v2v/virt-v2v-output-openstack.pod:210 ../v2v/virt-v2v-output-rhv.pod:225 ../v2v/virt-v2v-support.pod:143 ../v2v/virt-v2v.pod:1677
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:140 ../builder/virt-builder-repository.pod:201 ../builder/virt-builder.pod:1881 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:292 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:153 ../cat/virt-ls.pod:535 ../cat/virt-tail.pod:253 ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143 ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265 ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411 ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400 ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719 ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409 ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../fish/guestfish.pod:1638 ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:42 ../fish/virt-copy-out.pod:37 ../fish/virt-tar-in.pod:39 ../fish/virt-tar-out.pod:39 ../format/virt-format.pod:185 ../fuse/guestmount.pod:443 ../fuse/guestunmount.pod:147 ../get-kernel/virt-get-kernel.pod:205 ../gobject/guestfs-gobject.pod:44 ../golang/examples/guestfs-golang.pod:76 ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:159 ../lib/guestfs.pod:3443 ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215 ../ocaml/examples/guestfs-ocaml.pod:80 ../perl/examples/guestfs-perl.pod:38 ../python/examples/guestfs-python.pod:63 ../rescue/virt-rescue.pod:494 ../resize/virt-resize.pod:842 ../ruby/examples/guestfs-ruby.pod:34 ../sparsify/virt-sparsify.pod:474 ../sysprep/virt-sysprep.pod:616 ../test-tool/libguestfs-test-tool.pod:178 ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263 ../tools/virt-tar:292 ../tools/virt-win-reg:804 ../utils/boot-analysis/boot-analysis.pod:88 ../utils/boot-benchmark/boot-benchmark.pod:57 ../v2v/test-harness/virt-v2v-test-harness.pod:263 ../v2v/virt-v2v-copy-to-local.pod:112 ../v2v/virt-v2v-input-vmware.pod:618 ../v2v/virt-v2v-input-xen.pod:117 ../v2v/virt-v2v-output-local.pod:198 ../v2v/virt-v2v-output-openstack.pod:210 ../v2v/virt-v2v-output-rhv.pod:225 ../v2v/virt-v2v-support.pod:143 ../v2v/virt-v2v.pod:1677
 msgid "SEE ALSO"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:152 ../builder/virt-builder-repository.pod:210 ../builder/virt-builder.pod:1906 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:307 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:168 ../cat/virt-ls.pod:549 ../cat/virt-tail.pod:268 ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152 ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279 ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421 ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739 ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421 ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415 ../erlang/examples/guestfs-erlang.pod:115 ../examples/guestfs-examples.pod:73 ../fish/guestfish.pod:1679 ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:56 ../fish/virt-copy-out.pod:51 ../fish/virt-tar-in.pod:54 ../fish/virt-tar-out.pod:53 ../format/virt-format.pod:199 ../fuse/guestmount.pod:461 ../fuse/guestunmount.pod:160 ../get-kernel/virt-get-kernel.pod:217 ../gobject/guestfs-gobject.pod:62 ../golang/examples/guestfs-golang.pod:96 ../inspector/virt-inspector.pod:530 ../java/examples/guestfs-java.pod:179 ../lib/guestfs.pod:3525 ../lua/examples/guestfs-lua.pod:156 ../make-fs/virt-make-fs.pod:233 ../ocaml/examples/guestfs-ocaml.pod:100 ../perl/examples/guestfs-perl.pod:58 ../python/examples/guestfs-python.pod:82 ../rescue/virt-rescue.pod:508 ../resize/virt-resize.pod:871 ../ruby/examples/guestfs-ruby.pod:53 ../sparsify/virt-sparsify.pod:491 ../sysprep/virt-sysprep.pod:639 ../test-tool/libguestfs-test-tool.pod:188 ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278 ../tools/virt-tar:310 ../tools/virt-win-reg:823 ../utils/boot-analysis/boot-analysis.pod:97 ../utils/boot-benchmark/boot-benchmark.pod:66 ../v2v/test-harness/virt-v2v-test-harness.pod:277 ../v2v/virt-v2v-copy-to-local.pod:124 ../v2v/virt-v2v-input-vmware.pod:626 ../v2v/virt-v2v-input-xen.pod:125 ../v2v/virt-v2v-output-local.pod:206 ../v2v/virt-v2v-output-openstack.pod:220 ../v2v/virt-v2v-output-rhv.pod:233 ../v2v/virt-v2v-support.pod:152 ../v2v/virt-v2v.pod:1718
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:152 ../builder/virt-builder-repository.pod:210 ../builder/virt-builder.pod:1906 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:307 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:168 ../cat/virt-ls.pod:549 ../cat/virt-tail.pod:268 ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152 ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279 ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421 ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413 ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739 ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421 ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415 ../erlang/examples/guestfs-erlang.pod:115 ../examples/guestfs-examples.pod:73 ../fish/guestfish.pod:1679 ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:56 ../fish/virt-copy-out.pod:51 ../fish/virt-tar-in.pod:54 ../fish/virt-tar-out.pod:53 ../format/virt-format.pod:199 ../fuse/guestmount.pod:461 ../fuse/guestunmount.pod:160 ../get-kernel/virt-get-kernel.pod:217 ../gobject/guestfs-gobject.pod:62 ../golang/examples/guestfs-golang.pod:96 ../inspector/virt-inspector.pod:530 ../java/examples/guestfs-java.pod:179 ../lib/guestfs.pod:3525 ../lua/examples/guestfs-lua.pod:156 ../make-fs/virt-make-fs.pod:233 ../ocaml/examples/guestfs-ocaml.pod:100 ../perl/examples/guestfs-perl.pod:58 ../python/examples/guestfs-python.pod:82 ../rescue/virt-rescue.pod:508 ../resize/virt-resize.pod:871 ../ruby/examples/guestfs-ruby.pod:53 ../sparsify/virt-sparsify.pod:491 ../sysprep/virt-sysprep.pod:639 ../test-tool/libguestfs-test-tool.pod:188 ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278 ../tools/virt-tar:310 ../tools/virt-win-reg:823 ../utils/boot-analysis/boot-analysis.pod:97 ../utils/boot-benchmark/boot-benchmark.pod:66 ../v2v/test-harness/virt-v2v-test-harness.pod:277 ../v2v/virt-v2v-copy-to-local.pod:124 ../v2v/virt-v2v-input-vmware.pod:626 ../v2v/virt-v2v-input-xen.pod:125 ../v2v/virt-v2v-output-local.pod:206 ../v2v/virt-v2v-output-openstack.pod:220 ../v2v/virt-v2v-output-rhv.pod:233 ../v2v/virt-v2v-support.pod:152 ../v2v/virt-v2v.pod:1718
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1103,17 +1103,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:148 ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832 ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140 ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628 ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417 ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111 ../examples/guestfs-examples.pod:69 ../fish/guestfish.pod:1675 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:52 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:50 ../fish/virt-tar-out.pod:49 ../fuse/guestmount.pod:457 ../fuse/guestunmount.pod:156 ../gobject/guestfs-gobject.pod:58 ../golang/examples/guestfs-golang.pod:92 ../inspector/virt-inspector.pod:516 ../java/examples/guestfs-java.pod:175 ../lib/guestfs.pod:3521 ../lua/examples/guestfs-lua.pod:152 ../ocaml/examples/guestfs-ocaml.pod:96 ../perl/examples/guestfs-perl.pod:54 ../python/examples/guestfs-python.pod:78 ../ruby/examples/guestfs-ruby.pod:49 ../sysprep/virt-sysprep.pod:633 ../test-tool/libguestfs-test-tool.pod:184 ../v2v/test-harness/virt-v2v-test-harness.pod:273 ../v2v/virt-v2v-copy-to-local.pod:120 ../v2v/virt-v2v.pod:1696
+#: ../appliance/libguestfs-make-fixed-appliance.pod:148 ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832 ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149 ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628 ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417 ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111 ../examples/guestfs-examples.pod:69 ../fish/guestfish.pod:1675 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:52 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:50 ../fish/virt-tar-out.pod:49 ../fuse/guestmount.pod:457 ../fuse/guestunmount.pod:156 ../gobject/guestfs-gobject.pod:58 ../golang/examples/guestfs-golang.pod:92 ../inspector/virt-inspector.pod:516 ../java/examples/guestfs-java.pod:175 ../lib/guestfs.pod:3521 ../lua/examples/guestfs-lua.pod:152 ../ocaml/examples/guestfs-ocaml.pod:96 ../perl/examples/guestfs-perl.pod:54 ../python/examples/guestfs-python.pod:78 ../ruby/examples/guestfs-ruby.pod:49 ../sysprep/virt-sysprep.pod:633 ../test-tool/libguestfs-test-tool.pod:184 ../v2v/test-harness/virt-v2v-test-harness.pod:273 ../v2v/virt-v2v-copy-to-local.pod:120 ../v2v/virt-v2v.pod:1696
 msgid "AUTHORS"
 msgstr ""
 
 #. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:150 ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419 ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737 ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404 ../erlang/examples/guestfs-erlang.pod:113 ../examples/guestfs-examples.pod:71 ../fish/guestfish.pod:1677 ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:54 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:52 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:459 ../fuse/guestunmount.pod:158 ../gobject/guestfs-gobject.pod:60 ../golang/examples/guestfs-golang.pod:94 ../java/examples/guestfs-java.pod:177 ../lib/guestfs.pod:3523 ../lua/examples/guestfs-lua.pod:154 ../ocaml/examples/guestfs-ocaml.pod:98 ../perl/examples/guestfs-perl.pod:56 ../python/examples/guestfs-python.pod:80 ../ruby/examples/guestfs-ruby.pod:51 ../test-tool/libguestfs-test-tool.pod:186
+#: ../appliance/libguestfs-make-fixed-appliance.pod:150 ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419 ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411 ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737 ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404 ../erlang/examples/guestfs-erlang.pod:113 ../examples/guestfs-examples.pod:71 ../fish/guestfish.pod:1677 ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:54 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:52 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:459 ../fuse/guestunmount.pod:158 ../gobject/guestfs-gobject.pod:60 ../golang/examples/guestfs-golang.pod:94 ../java/examples/guestfs-java.pod:177 ../lib/guestfs.pod:3523 ../lua/examples/guestfs-lua.pod:154 ../ocaml/examples/guestfs-ocaml.pod:98 ../perl/examples/guestfs-perl.pod:56 ../python/examples/guestfs-python.pod:80 ../ruby/examples/guestfs-ruby.pod:51 ../test-tool/libguestfs-test-tool.pod:186
 msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
 msgstr ""
 
 #. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551 ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281 ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146 ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741 ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423 ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681 ../fuse/guestmount.pod:463 ../lib/guestfs.pod:3527 ../rescue/virt-rescue.pod:510 ../test-tool/libguestfs-test-tool.pod:190 ../tools/virt-list-partitions:280 ../v2v/virt-v2v-copy-to-local.pod:126 ../v2v/virt-v2v-input-vmware.pod:628 ../v2v/virt-v2v-input-xen.pod:127 ../v2v/virt-v2v-output-local.pod:208 ../v2v/virt-v2v-output-openstack.pod:222 ../v2v/virt-v2v-output-rhv.pod:235 ../v2v/virt-v2v-support.pod:154 ../v2v/virt-v2v.pod:1720
+#: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551 ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281 ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155 ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741 ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423 ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681 ../fuse/guestmount.pod:463 ../lib/guestfs.pod:3527 ../rescue/virt-rescue.pod:510 ../test-tool/libguestfs-test-tool.pod:190 ../tools/virt-list-partitions:280 ../v2v/virt-v2v-copy-to-local.pod:126 ../v2v/virt-v2v-input-vmware.pod:628 ../v2v/virt-v2v-input-xen.pod:127 ../v2v/virt-v2v-output-local.pod:208 ../v2v/virt-v2v-output-openstack.pod:222 ../v2v/virt-v2v-output-rhv.pod:235 ../v2v/virt-v2v-support.pod:154 ../v2v/virt-v2v.pod:1720
 msgid "Copyright (C) 2009-2019 Red Hat Inc."
 msgstr ""
 
@@ -2384,7 +2384,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988 ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494 ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927 ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170 ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457 ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156 ../docs/internal-documentation.pod:267 ../docs/internal-documentation.pod:1321 ../docs/internal-documentation.pod:1444 ../lib/guestfs.pod:1758 ../lib/guestfs.pod:2098 ../rescue/virt-rescue.pod:408 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:668 ../resize/virt-resize.pod:784 ../sparsify/virt-sparsify.pod:398 ../v2v/virt-v2v-input-vmware.pod:94 ../v2v/virt-v2v-input-vmware.pod:192 ../v2v/virt-v2v-input-vmware.pod:530 ../v2v/virt-v2v-output-local.pod:102 ../v2v/virt-v2v.pod:1524
+#: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988 ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494 ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927 ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170 ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457 ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156 ../docs/internal-documentation.pod:267 ../docs/internal-documentation.pod:1321 ../docs/internal-documentation.pod:1444 ../lib/guestfs.pod:1758 ../lib/guestfs.pod:2098 ../rescue/virt-rescue.pod:408 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:668 ../resize/virt-resize.pod:784 ../sparsify/virt-sparsify.pod:398 ../v2v/virt-v2v-input-vmware.pod:94 ../v2v/virt-v2v-input-vmware.pod:192 ../v2v/virt-v2v-input-vmware.pod:530 ../v2v/virt-v2v-output-local.pod:102 ../v2v/virt-v2v.pod:1524
 msgid "1."
 msgstr ""
 
@@ -2396,7 +2396,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993 ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499 ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931 ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176 ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463 ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161 ../docs/internal-documentation.pod:274 ../docs/internal-documentation.pod:1326 ../docs/internal-documentation.pod:1450 ../lib/guestfs.pod:1762 ../lib/guestfs.pod:2102 ../rescue/virt-rescue.pod:416 ../resize/virt-resize.pod:43 ../resize/virt-resize.pod:675 ../resize/virt-resize.pod:802 ../sparsify/virt-sparsify.pod:405 ../v2v/virt-v2v-input-vmware.pod:99 ../v2v/virt-v2v-input-vmware.pod:199 ../v2v/virt-v2v-input-vmware.pod:534 ../v2v/virt-v2v-output-local.pod:116 ../v2v/virt-v2v.pod:1531
+#: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993 ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499 ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931 ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176 ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463 ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161 ../docs/internal-documentation.pod:274 ../docs/internal-documentation.pod:1326 ../docs/internal-documentation.pod:1450 ../lib/guestfs.pod:1762 ../lib/guestfs.pod:2102 ../rescue/virt-rescue.pod:416 ../resize/virt-resize.pod:43 ../resize/virt-resize.pod:675 ../resize/virt-resize.pod:802 ../sparsify/virt-sparsify.pod:405 ../v2v/virt-v2v-input-vmware.pod:99 ../v2v/virt-v2v-input-vmware.pod:199 ../v2v/virt-v2v-input-vmware.pod:534 ../v2v/virt-v2v-output-local.pod:116 ../v2v/virt-v2v.pod:1531
 msgid "2."
 msgstr ""
 
@@ -2408,7 +2408,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003 ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505 ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935 ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225 ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166 ../docs/internal-documentation.pod:284 ../docs/internal-documentation.pod:1331 ../docs/internal-documentation.pod:1458 ../lib/guestfs.pod:1766 ../lib/guestfs.pod:2108 ../rescue/virt-rescue.pod:425 ../resize/virt-resize.pod:51 ../resize/virt-resize.pod:681 ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v-input-vmware.pod:204 ../v2v/virt-v2v-output-local.pod:124 ../v2v/virt-v2v.pod:1537
+#: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003 ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505 ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935 ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225 ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166 ../docs/internal-documentation.pod:284 ../docs/internal-documentation.pod:1331 ../docs/internal-documentation.pod:1458 ../lib/guestfs.pod:1766 ../lib/guestfs.pod:2108 ../rescue/virt-rescue.pod:425 ../resize/virt-resize.pod:51 ../resize/virt-resize.pod:681 ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v-input-vmware.pod:204 ../v2v/virt-v2v-output-local.pod:124 ../v2v/virt-v2v.pod:1537
 msgid "3."
 msgstr ""
 
@@ -7457,12 +7457,12 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362 ../docs/guestfs-release-notes.pod:1366 ../docs/guestfs-release-notes.pod:2002 ../docs/guestfs-release-notes.pod:2006 ../docs/guestfs-release-notes.pod:2545 ../docs/guestfs-release-notes.pod:2549 ../docs/guestfs-release-notes.pod:3208 ../docs/guestfs-release-notes.pod:3212 ../docs/guestfs-release-notes.pod:3765 ../docs/guestfs-release-notes.pod:3769 ../docs/guestfs-release-notes.pod:4309 ../docs/guestfs-release-notes.pod:4313 ../docs/guestfs-release-notes.pod:4613 ../docs/guestfs-release-notes.pod:4617 ../docs/guestfs-release-notes.pod:4962 ../docs/guestfs-release-notes.pod:4966 ../docs/guestfs-release-notes.pod:5518 ../docs/guestfs-release-notes.pod:5522 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:25 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:25 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:25 ../lib/guestfs-actions.pod:1 ../lib/guestfs-actions.pod:25 ../lib/guestfs-availability.pod:1 ../lib/guestfs-availability.pod:25 ../lib/guestfs-structs.pod:1 ../lib/guestfs-structs.pod:25
+#: ../common/mlcustomize/customize-options.pod:1 ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362 ../docs/guestfs-release-notes.pod:1366 ../docs/guestfs-release-notes.pod:2002 ../docs/guestfs-release-notes.pod:2006 ../docs/guestfs-release-notes.pod:2545 ../docs/guestfs-release-notes.pod:2549 ../docs/guestfs-release-notes.pod:3208 ../docs/guestfs-release-notes.pod:3212 ../docs/guestfs-release-notes.pod:3765 ../docs/guestfs-release-notes.pod:3769 ../docs/guestfs-release-notes.pod:4309 ../docs/guestfs-release-notes.pod:4313 ../docs/guestfs-release-notes.pod:4613 ../docs/guestfs-release-notes.pod:4617 ../docs/guestfs-release-notes.pod:4962 ../docs/guestfs-release-notes.pod:4966 ../docs/guestfs-release-notes.pod:5518 ../docs/guestfs-release-notes.pod:5522 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:25 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:25 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:25 ../lib/guestfs-actions.pod:1 ../lib/guestfs-actions.pod:25 ../lib/guestfs-availability.pod:1 ../lib/guestfs-availability.pod:25 ../lib/guestfs-structs.pod:1 ../lib/guestfs-structs.pod:25
 msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -7474,7 +7474,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9 ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -7482,7 +7482,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11 ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -7493,7 +7493,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16 ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -7504,7 +7504,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21 ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -7514,12 +7514,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -7527,12 +7527,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38 ../sysprep/sysprep-extra-options.pod:11
+#: ../common/mlcustomize/customize-options.pod:38 ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
 " --append-line '/etc/hosts:10.0.0.1 foo'\n"
@@ -7540,14 +7540,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40 ../sysprep/sysprep-extra-options.pod:13
+#: ../common/mlcustomize/customize-options.pod:40 ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
 "latter only if the existing file does not already end with a newline."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44 ../sysprep/sysprep-extra-options.pod:17
+#: ../common/mlcustomize/customize-options.pod:44 ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
 "existing content of the file, so this command does the right thing for files "
@@ -7556,12 +7556,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49 ../sysprep/sysprep-extra-options.pod:22
+#: ../common/mlcustomize/customize-options.pod:49 ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51 ../sysprep/sysprep-extra-options.pod:24
+#: ../common/mlcustomize/customize-options.pod:51 ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
 " --append-line '/etc/hosts:10.0.0.1 foo'\n"
@@ -7570,12 +7570,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54 ../sysprep/sysprep-extra-options.pod:27
+#: ../common/mlcustomize/customize-options.pod:54 ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56 ../sysprep/sysprep-extra-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:56 ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
 " --append-line '/etc/hosts:'\n"
@@ -7584,41 +7584,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61 ../sysprep/sysprep-extra-options.pod:35
+#: ../common/mlcustomize/customize-options.pod:61 ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63 ../sysprep/sysprep-extra-options.pod:37
+#: ../common/mlcustomize/customize-options.pod:63 ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
 "with C<0> to get octal, ie. use C<0700> not C<700>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68 ../sysprep/sysprep-extra-options.pod:43
+#: ../common/mlcustomize/customize-options.pod:68 ../sysprep/sysprep-extra-options.pod:43
 msgid "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71 ../sysprep/sysprep-extra-options.pod:46
+#: ../common/mlcustomize/customize-options.pod:71 ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
 "example:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74 ../sysprep/sysprep-extra-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:74 ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
 " delete /some/file\n"
@@ -7628,7 +7628,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78 ../sysprep/sysprep-extra-options.pod:53
+#: ../common/mlcustomize/customize-options.pod:78 ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
 "ignored as well.  Furthermore, arguments can be spread across multiple "
@@ -7637,7 +7637,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83 ../sysprep/sysprep-extra-options.pod:58
+#: ../common/mlcustomize/customize-options.pod:83 ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
 " edit /some/file:\\\n"
@@ -7646,53 +7646,53 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86 ../sysprep/sysprep-extra-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:86 ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
 "they were specified as I<--delete /some/file> on the command line."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92 ../sysprep/sysprep-extra-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:92 ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101 ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70 ../sysprep/sysprep-extra-options.pod:78 ../sysprep/sysprep-extra-options.pod:200
+#: ../common/mlcustomize/customize-options.pod:94 ../common/mlcustomize/customize-options.pod:101 ../common/mlcustomize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70 ../sysprep/sysprep-extra-options.pod:78 ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98 ../sysprep/sysprep-extra-options.pod:75
+#: ../common/mlcustomize/customize-options.pod:98 ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
 "them in the directory C<REMOTEDIR> (which must exist)."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105 ../sysprep/sysprep-extra-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:105 ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
 "recursively)."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108 ../sysprep/sysprep-extra-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:108 ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
 "escape glob characters from the host shell, if that is required.  For "
@@ -7700,7 +7700,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112 ../sysprep/sysprep-extra-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:112 ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
 " virt-customize --delete '/var/log/*.log'.\n"
@@ -7708,99 +7708,99 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114 ../sysprep/sysprep-extra-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:114 ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118 ../sysprep/sysprep-extra-options.pod:97
+#: ../common/mlcustomize/customize-options.pod:118 ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127 ../sysprep/sysprep-extra-options.pod:99
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127 ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
 "by the shell."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130 ../sysprep/sysprep-extra-options.pod:102
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130 ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125 ../sysprep/sysprep-extra-options.pod:104
+#: ../common/mlcustomize/customize-options.pod:125 ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129 ../sysprep/sysprep-extra-options.pod:109
+#: ../common/mlcustomize/customize-options.pod:129 ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
 "the script runs (as root, late in the boot process)."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132 ../sysprep/sysprep-extra-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:132 ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134 ../sysprep/sysprep-extra-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:134 ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
 "conveniently wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137 ../customize/customize-options.pod:150 ../sysprep/sysprep-extra-options.pod:117 ../sysprep/sysprep-extra-options.pod:131
+#: ../common/mlcustomize/customize-options.pod:137 ../common/mlcustomize/customize-options.pod:150 ../sysprep/sysprep-extra-options.pod:117 ../sysprep/sysprep-extra-options.pod:131
 msgid ""
 "You can have multiple I<--firstboot> options.  They run in the same order "
 "that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140 ../customize/customize-options.pod:153 ../sysprep/sysprep-extra-options.pod:120 ../sysprep/sysprep-extra-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:140 ../common/mlcustomize/customize-options.pod:153 ../sysprep/sysprep-extra-options.pod:120 ../sysprep/sysprep-extra-options.pod:134
 msgid ""
 "Please take a look at L<virt-builder(1)/FIRST BOOT SCRIPTS> for more "
 "information and caveats about the first boot scripts."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143 ../customize/customize-options.pod:156 ../sysprep/sysprep-extra-options.pod:123 ../sysprep/sysprep-extra-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:143 ../common/mlcustomize/customize-options.pod:156 ../sysprep/sysprep-extra-options.pod:123 ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147 ../sysprep/sysprep-extra-options.pod:128
+#: ../common/mlcustomize/customize-options.pod:147 ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
 "(as root, late in the boot process)."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160 ../sysprep/sysprep-extra-options.pod:142
+#: ../common/mlcustomize/customize-options.pod:160 ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "when the guest first boots using the guest’s package manager (eg. apt, yum, "
@@ -7808,31 +7808,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164 ../customize/customize-options.pod:178 ../sysprep/sysprep-extra-options.pod:146 ../sysprep/sysprep-extra-options.pod:162
+#: ../common/mlcustomize/customize-options.pod:164 ../common/mlcustomize/customize-options.pod:178 ../sysprep/sysprep-extra-options.pod:146 ../sysprep/sysprep-extra-options.pod:162
 msgid ""
 "For an overview on the different ways to install packages, see "
 "L<virt-builder(1)/INSTALLING PACKAGES>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169 ../sysprep/sysprep-extra-options.pod:152
+#: ../common/mlcustomize/customize-options.pod:169 ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted "
 "hostname.domainname (FQDN) if you want."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174 ../sysprep/sysprep-extra-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:174 ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "during the image build using the guest’s package manager (eg. apt, yum, "
@@ -7840,56 +7840,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181 ../sysprep/sysprep-extra-options.pod:165
+#: ../common/mlcustomize/customize-options.pod:181 ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185 ../sysprep/sysprep-extra-options.pod:184
+#: ../common/mlcustomize/customize-options.pod:185 ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
 "C<TARGET>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190 ../sysprep/sysprep-extra-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190 ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192 ../sysprep/sysprep-extra-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192 ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
 "also works if the directory already exists."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197 ../sysprep/sysprep-extra-options.pod:198
+#: ../common/mlcustomize/customize-options.pod:197 ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203 ../sysprep/sysprep-extra-options.pod:205
+#: ../common/mlcustomize/customize-options.pod:203 ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
 "building is complete.  If you don't want to reveal precisely how the image "
@@ -7897,57 +7897,57 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207 ../sysprep/sysprep-extra-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:207 ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211 ../sysprep/sysprep-extra-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:211 ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
 "account)."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214 ../customize/customize-options.pod:243 ../sysprep/sysprep-extra-options.pod:217 ../sysprep/sysprep-extra-options.pod:262
+#: ../common/mlcustomize/customize-options.pod:214 ../common/mlcustomize/customize-options.pod:243 ../sysprep/sysprep-extra-options.pod:217 ../sysprep/sysprep-extra-options.pod:262
 msgid ""
 "See L<virt-builder(1)/USERS AND PASSWORDS> for the format of the C<SELECTOR> "
 "field, and also how to set up user accounts."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219 ../sysprep/sysprep-extra-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:219 ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
 "the password encryption of that password to C<md5>, C<sha256> or C<sha512>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223 ../sysprep/sysprep-extra-options.pod:227
+#: ../common/mlcustomize/customize-options.pod:223 ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
 "guest)."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226 ../sysprep/sysprep-extra-options.pod:230
+#: ../common/mlcustomize/customize-options.pod:226 ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
 "secure against modern attacks."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229 ../sysprep/sysprep-extra-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:229 ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
 "have support for SHA-512, in which case it will use C<md5>.  You can "
@@ -7955,7 +7955,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233 ../sysprep/sysprep-extra-options.pod:237
+#: ../common/mlcustomize/customize-options.pod:233 ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
 "when you create new user accounts inside the guest.  If you want to do that, "
@@ -7965,29 +7965,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241 ../sysprep/sysprep-extra-options.pod:260
+#: ../common/mlcustomize/customize-options.pod:241 ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246 ../sysprep/sysprep-extra-options.pod:265
+#: ../common/mlcustomize/customize-options.pod:246 ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
 "is given a I<random> root password."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251 ../sysprep/sysprep-extra-options.pod:271
+#: ../common/mlcustomize/customize-options.pod:251 ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
 "The script runs virtualized inside a small appliance, chrooted into the "
@@ -7995,12 +7995,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255 ../sysprep/sysprep-extra-options.pod:275
+#: ../common/mlcustomize/customize-options.pod:255 ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257 ../customize/customize-options.pod:273 ../sysprep/sysprep-extra-options.pod:277 ../sysprep/sysprep-extra-options.pod:294
+#: ../common/mlcustomize/customize-options.pod:257 ../common/mlcustomize/customize-options.pod:273 ../sysprep/sysprep-extra-options.pod:277 ../sysprep/sysprep-extra-options.pod:294
 msgid ""
 "If libguestfs supports it then a limited network connection is available but "
 "it only allows outgoing network connections.  You can also attach data disks "
@@ -8010,68 +8010,68 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263 ../sysprep/sysprep-extra-options.pod:283
+#: ../common/mlcustomize/customize-options.pod:263 ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
 "they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266 ../customize/customize-options.pod:282 ../sysprep/sysprep-extra-options.pod:286 ../sysprep/sysprep-extra-options.pod:303
+#: ../common/mlcustomize/customize-options.pod:266 ../common/mlcustomize/customize-options.pod:282 ../sysprep/sysprep-extra-options.pod:286 ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270 ../sysprep/sysprep-extra-options.pod:291
+#: ../common/mlcustomize/customize-options.pod:270 ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
 "virtualized inside a small appliance, chrooted into the guest filesystem."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279 ../sysprep/sysprep-extra-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:279 ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
 "that they appear on the command line."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286 ../sysprep/sysprep-extra-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:286 ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292 ../sysprep/sysprep-extra-options.pod:336
+#: ../common/mlcustomize/customize-options.pod:292 ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296 ../sysprep/sysprep-extra-options.pod:340
+#: ../common/mlcustomize/customize-options.pod:296 ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302 ../sysprep/sysprep-extra-options.pod:347
+#: ../common/mlcustomize/customize-options.pod:302 ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304 ../sysprep/sysprep-extra-options.pod:349
+#: ../common/mlcustomize/customize-options.pod:304 ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
 "this will instead touch F</.autorelabel> on the image to schedule a relabel "
@@ -8079,147 +8079,147 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308 ../sysprep/sysprep-extra-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:308 ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312 ../sysprep/sysprep-extra-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:312 ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314 ../customize/customize-options.pod:321 ../sysprep/sysprep-extra-options.pod:360 ../sysprep/sysprep-extra-options.pod:368
+#: ../common/mlcustomize/customize-options.pod:314 ../common/mlcustomize/customize-options.pod:321 ../sysprep/sysprep-extra-options.pod:360 ../sysprep/sysprep-extra-options.pod:368
 msgid ""
 "See L<virt-builder(1)/SUBSCRIPTION-MANAGER> for the format of the "
 "C<SELECTOR> field."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319 ../sysprep/sysprep-extra-options.pod:366
+#: ../common/mlcustomize/customize-options.pod:319 ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326 ../sysprep/sysprep-extra-options.pod:374
+#: ../common/mlcustomize/customize-options.pod:326 ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328 ../sysprep/sysprep-extra-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:328 ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332 ../sysprep/sysprep-extra-options.pod:381
+#: ../common/mlcustomize/customize-options.pod:332 ../sysprep/sysprep-extra-options.pod:381
 msgid "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337 ../sysprep/sysprep-extra-options.pod:387
+#: ../common/mlcustomize/customize-options.pod:337 ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341 ../sysprep/sysprep-extra-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:341 ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
 "without supplying a password.  The C<USER> must exist already in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345 ../sysprep/sysprep-extra-options.pod:396
+#: ../common/mlcustomize/customize-options.pod:345 ../sysprep/sysprep-extra-options.pod:396
 msgid "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348 ../sysprep/sysprep-extra-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:348 ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
 "for more keys for each user."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353 ../sysprep/sysprep-extra-options.pod:405
+#: ../common/mlcustomize/customize-options.pod:353 ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
 "like C<Europe/London>"
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358 ../sysprep/sysprep-extra-options.pod:411
+#: ../common/mlcustomize/customize-options.pod:358 ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362 ../sysprep/sysprep-extra-options.pod:416
+#: ../common/mlcustomize/customize-options.pod:362 ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
 "already."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367 ../sysprep/sysprep-extra-options.pod:422
+#: ../common/mlcustomize/customize-options.pod:367 ../sysprep/sysprep-extra-options.pod:422
 msgid "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371 ../sysprep/sysprep-extra-options.pod:427
+#: ../common/mlcustomize/customize-options.pod:371 ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
 "during the image build using the guest’s package manager (eg. apt, yum, "
@@ -8228,17 +8228,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376 ../sysprep/sysprep-extra-options.pod:432
+#: ../common/mlcustomize/customize-options.pod:376 ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380 ../sysprep/sysprep-extra-options.pod:437
+#: ../common/mlcustomize/customize-options.pod:380 ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
 "is required to update the packages already installed in the template to "
@@ -8246,17 +8246,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384 ../sysprep/sysprep-extra-options.pod:441
+#: ../common/mlcustomize/customize-options.pod:384 ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388 ../sysprep/sysprep-extra-options.pod:446
+#: ../common/mlcustomize/customize-options.pod:388 ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -8264,14 +8264,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392 ../sysprep/sysprep-extra-options.pod:450
+#: ../common/mlcustomize/customize-options.pod:392 ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395 ../sysprep/sysprep-extra-options.pod:453
+#: ../common/mlcustomize/customize-options.pod:395 ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -8279,17 +8279,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399 ../sysprep/sysprep-extra-options.pod:457
+#: ../common/mlcustomize/customize-options.pod:399 ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403 ../sysprep/sysprep-extra-options.pod:462
+#: ../common/mlcustomize/customize-options.pod:403 ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
@@ -11571,7 +11571,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496 ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138 ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258 ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072 ../lua/examples/guestfs-lua.pod:64 ../v2v/virt-v2v-output-openstack.pod:73 ../v2v/virt-v2v-output-openstack.pod:99
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505 ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138 ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258 ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072 ../lua/examples/guestfs-lua.pod:64 ../v2v/virt-v2v-output-openstack.pod:73 ../v2v/virt-v2v-output-openstack.pod:99
 msgid "or:"
 msgstr ""
 
@@ -15209,285 +15209,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
+msgid "Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
 msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like "
 "C<virt-sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out "
 "actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -15495,126 +15515,126 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -15622,84 +15642,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -15708,124 +15728,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, "
 "libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and "
 "F<m4/guestfs-*.m4>.  Most of the configure script is split over many m4 "
@@ -15834,14 +15854,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -15849,12 +15869,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -15862,29 +15882,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly "
@@ -15892,7 +15912,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -15904,7 +15924,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -15914,7 +15934,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -15924,31 +15944,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -15956,12 +15976,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -15969,12 +15989,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description "
@@ -15984,61 +16004,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -16046,7 +16066,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -16056,7 +16076,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a "
 "run-time check, which, if it fails, causes the test to be skipped.  Useful "
@@ -16066,14 +16086,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -16081,12 +16101,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -16094,17 +16114,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -16112,29 +16132,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -16142,31 +16162,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -16174,7 +16194,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -16182,12 +16202,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -16195,7 +16215,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -16212,7 +16232,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -16220,7 +16240,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -16228,7 +16248,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -16238,7 +16258,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -16246,7 +16266,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -16254,19 +16274,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -16276,14 +16296,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., "
 "~/.emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -16299,7 +16319,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -16317,17 +16337,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -16335,61 +16355,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure "
@@ -16397,36 +16417,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -16434,27 +16454,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -16462,7 +16482,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -16470,12 +16490,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure "
@@ -16483,14 +16503,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -16498,29 +16518,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using "
@@ -16528,17 +16548,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -16547,12 +16567,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -16560,12 +16580,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips "
 "(ie. returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call "
@@ -16573,12 +16593,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -16587,76 +16607,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -16667,31 +16687,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -16699,12 +16719,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -16713,14 +16733,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -16728,19 +16748,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: "
 "L<http://www.redhat.com/mailman/listinfo/libguestfs> and CC to "
@@ -16748,50 +16768,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -16799,12 +16819,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -16813,17 +16833,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -16832,31 +16852,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -16866,12 +16886,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -16879,14 +16899,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -16894,14 +16914,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -16909,7 +16929,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -16918,7 +16938,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -16927,48 +16947,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -16977,7 +16997,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -16987,22 +17007,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -17010,7 +17030,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -17020,7 +17040,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -17028,29 +17048,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -17058,19 +17078,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -17078,7 +17098,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -17086,31 +17106,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -17119,12 +17139,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -17132,12 +17152,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -17145,62 +17165,62 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30 ../docs/guestfs-testing.pod:215
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30 ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -17208,12 +17228,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -17221,36 +17241,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under "
 "L<http://libguestfs.org/download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, "
 "ie. 1.XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -17263,12 +17283,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -17277,50 +17297,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, "
 "L<guestfs-internals(1)>, L<guestfs-performance(1)>, "
diff --git a/po-docs/nl.po b/po-docs/nl.po
index d15920bb7..3d1b54883 100644
--- a/po-docs/nl.po
+++ b/po-docs/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -596,7 +596,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1177,41 +1177,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1425,7 +1426,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1514,7 +1515,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1809,7 +1810,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1833,7 +1834,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1855,7 +1856,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3212,7 +3213,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3238,7 +3239,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3264,7 +3265,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8455,13 +8456,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8489,7 +8490,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8501,10 +8502,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8512,10 +8513,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8526,10 +8527,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8540,10 +8541,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8553,12 +8554,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8566,12 +8568,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8580,7 +8583,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8588,7 +8591,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8598,13 +8601,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8614,13 +8617,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8630,18 +8633,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8649,19 +8652,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8669,7 +8672,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8680,7 +8683,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8690,7 +8693,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8700,7 +8703,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8708,32 +8711,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8741,12 +8746,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8754,7 +8759,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8763,7 +8768,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8772,24 +8777,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8797,24 +8802,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8822,13 +8827,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8836,8 +8841,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8846,8 +8851,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8856,20 +8861,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8877,12 +8882,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8891,8 +8896,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8901,12 +8906,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8914,12 +8919,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8928,18 +8933,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8947,18 +8952,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8966,23 +8971,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -8991,18 +8996,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9010,8 +9015,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9020,12 +9025,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9033,7 +9038,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9041,7 +9046,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9049,7 +9054,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9058,7 +9063,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9068,18 +9073,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9087,12 +9092,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9101,14 +9106,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9120,7 +9125,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9128,20 +9133,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9149,7 +9154,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9157,41 +9162,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9200,25 +9205,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9227,63 +9232,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9291,14 +9296,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9306,12 +9311,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9319,23 +9324,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9343,24 +9348,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9370,18 +9375,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9390,18 +9395,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9410,7 +9415,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9418,7 +9423,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9427,18 +9432,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12750,7 +12755,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16405,284 +16410,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16690,127 +16716,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16818,84 +16844,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16903,124 +16929,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17029,14 +17055,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17044,12 +17070,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17057,29 +17083,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17087,7 +17113,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17099,7 +17125,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17109,7 +17135,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17119,31 +17145,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17151,12 +17177,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17164,12 +17190,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17179,61 +17205,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17241,7 +17267,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17251,7 +17277,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17261,14 +17287,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17276,13 +17302,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17290,18 +17316,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17309,29 +17335,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17339,31 +17365,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17371,7 +17397,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17379,12 +17405,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17392,7 +17418,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17409,7 +17435,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17417,7 +17443,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17425,7 +17451,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17435,7 +17461,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17443,7 +17469,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17451,19 +17477,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17473,14 +17499,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17496,7 +17522,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17514,18 +17540,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17533,61 +17559,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17595,36 +17621,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17632,27 +17658,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17660,7 +17686,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17668,12 +17694,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17681,14 +17707,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17696,29 +17722,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17726,18 +17752,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17746,12 +17772,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17759,12 +17785,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17772,13 +17798,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17787,76 +17813,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17867,32 +17893,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17900,12 +17926,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17914,14 +17940,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17929,69 +17955,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -17999,12 +18025,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18013,17 +18039,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18032,31 +18058,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18066,12 +18092,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18079,14 +18105,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18094,14 +18120,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18109,7 +18135,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18118,7 +18144,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18127,48 +18153,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18177,7 +18203,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18187,22 +18213,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18210,7 +18236,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18220,7 +18246,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18228,29 +18254,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18258,19 +18284,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18278,7 +18304,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18286,31 +18312,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18319,12 +18345,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18332,12 +18358,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18345,63 +18371,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18409,12 +18435,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18422,36 +18448,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18464,12 +18490,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18478,50 +18504,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/pt_BR.po b/po-docs/pt_BR.po
index 252a78221..617926ab5 100644
--- a/po-docs/pt_BR.po
+++ b/po-docs/pt_BR.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-01-29 09:50+0000\n"
 "Last-Translator: Rodrigo de Araujo Sousa Fonseca "
 "<rodrigodearaujo@fedoraproject.org>\n"
@@ -592,7 +592,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1173,41 +1173,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1421,7 +1422,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1510,7 +1511,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1805,7 +1806,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1829,7 +1830,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1851,7 +1852,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3208,7 +3209,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3234,7 +3235,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3260,7 +3261,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8451,13 +8452,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8485,7 +8486,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8497,10 +8498,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8508,10 +8509,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8522,10 +8523,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8536,10 +8537,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8549,12 +8550,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8562,12 +8564,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8576,7 +8579,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8584,7 +8587,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8594,13 +8597,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8610,13 +8613,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8626,18 +8629,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8645,19 +8648,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8665,7 +8668,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8676,7 +8679,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8686,7 +8689,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8696,7 +8699,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8704,32 +8707,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8737,12 +8742,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8750,7 +8755,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8759,7 +8764,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8768,24 +8773,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8793,24 +8798,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8818,13 +8823,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8832,8 +8837,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8842,8 +8847,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8852,20 +8857,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8873,12 +8878,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8887,8 +8892,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8897,12 +8902,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8910,12 +8915,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8924,18 +8929,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8943,18 +8948,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8962,23 +8967,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -8987,18 +8992,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9006,8 +9011,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9016,12 +9021,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9029,7 +9034,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9037,7 +9042,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9045,7 +9050,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9054,7 +9059,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9064,18 +9069,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9083,12 +9088,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9097,14 +9102,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9116,7 +9121,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9124,20 +9129,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9145,7 +9150,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9153,41 +9158,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9196,25 +9201,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9223,63 +9228,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9287,14 +9292,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9302,12 +9307,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9315,23 +9320,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9339,24 +9344,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9366,18 +9371,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9386,18 +9391,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9406,7 +9411,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9414,7 +9419,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9423,18 +9428,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12746,7 +12751,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16401,284 +16406,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16686,127 +16712,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16814,84 +16840,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16899,124 +16925,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17025,14 +17051,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17040,12 +17066,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17053,29 +17079,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17083,7 +17109,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17095,7 +17121,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17105,7 +17131,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17115,31 +17141,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17147,12 +17173,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17160,12 +17186,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17175,61 +17201,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17237,7 +17263,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17247,7 +17273,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17257,14 +17283,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17272,13 +17298,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17286,18 +17312,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17305,29 +17331,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17335,31 +17361,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17367,7 +17393,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17375,12 +17401,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17388,7 +17414,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17405,7 +17431,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17413,7 +17439,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17421,7 +17447,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17431,7 +17457,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17439,7 +17465,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17447,19 +17473,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17469,14 +17495,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17492,7 +17518,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17510,18 +17536,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17529,61 +17555,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17591,36 +17617,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17628,27 +17654,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17656,7 +17682,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17664,12 +17690,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17677,14 +17703,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17692,29 +17718,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17722,18 +17748,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17742,12 +17768,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17755,12 +17781,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17768,13 +17794,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17783,76 +17809,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17863,32 +17889,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17896,12 +17922,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17910,14 +17936,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17925,69 +17951,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -17995,12 +18021,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18009,17 +18035,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18028,31 +18054,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18062,12 +18088,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18075,14 +18101,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18090,14 +18116,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18105,7 +18131,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18114,7 +18140,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18123,48 +18149,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18173,7 +18199,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18183,22 +18209,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18206,7 +18232,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18216,7 +18242,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18224,29 +18250,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18254,19 +18280,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18274,7 +18300,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18282,31 +18308,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18315,12 +18341,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18328,12 +18354,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18341,63 +18367,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18405,12 +18431,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18418,36 +18444,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18460,12 +18486,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18474,50 +18500,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/tg.po b/po-docs/tg.po
index d530932c5..bf7eb1613 100644
--- a/po-docs/tg.po
+++ b/po-docs/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:34+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -595,7 +595,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1176,41 +1176,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1424,7 +1425,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1513,7 +1514,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1808,7 +1809,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1832,7 +1833,7 @@ msgstr "МУАЛЛИФ"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1854,7 +1855,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3211,7 +3212,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3237,7 +3238,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3263,7 +3264,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8454,13 +8455,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8488,7 +8489,7 @@ msgid "comment"
 msgstr "шарҳ"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8500,10 +8501,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8511,10 +8512,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8525,10 +8526,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8539,10 +8540,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8552,12 +8553,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8565,12 +8567,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8579,7 +8582,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8587,7 +8590,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8597,13 +8600,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8613,13 +8616,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8629,18 +8632,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8648,19 +8651,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8668,7 +8671,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8679,7 +8682,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8689,7 +8692,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8699,7 +8702,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8707,32 +8710,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8740,12 +8745,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8753,7 +8758,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8762,7 +8767,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8771,24 +8776,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8796,24 +8801,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8821,13 +8826,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8835,8 +8840,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8845,8 +8850,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8855,20 +8860,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8876,12 +8881,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8890,8 +8895,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8900,12 +8905,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8913,12 +8918,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8927,18 +8932,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8946,18 +8951,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8965,23 +8970,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -8990,18 +8995,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9009,8 +9014,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9019,12 +9024,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9032,7 +9037,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9040,7 +9045,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9048,7 +9053,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9057,7 +9062,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9067,18 +9072,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9086,12 +9091,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9100,14 +9105,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9119,7 +9124,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9127,20 +9132,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9148,7 +9153,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9156,41 +9161,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9199,25 +9204,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9226,63 +9231,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9290,14 +9295,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9305,12 +9310,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9318,23 +9323,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9342,24 +9347,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9369,18 +9374,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9389,18 +9394,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9409,7 +9414,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9417,7 +9422,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9426,18 +9431,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12749,7 +12754,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16404,284 +16409,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16689,127 +16715,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16817,84 +16843,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16902,124 +16928,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17028,14 +17054,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17043,12 +17069,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17056,29 +17082,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17086,7 +17112,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17098,7 +17124,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17108,7 +17134,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17118,31 +17144,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17150,12 +17176,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17163,12 +17189,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17178,61 +17204,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17240,7 +17266,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17250,7 +17276,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17260,14 +17286,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17275,13 +17301,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17289,18 +17315,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17308,29 +17334,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17338,31 +17364,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17370,7 +17396,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17378,12 +17404,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17391,7 +17417,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17408,7 +17434,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17416,7 +17442,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17424,7 +17450,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17434,7 +17460,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17442,7 +17468,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17450,19 +17476,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17472,14 +17498,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17495,7 +17521,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17513,18 +17539,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17532,61 +17558,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17594,36 +17620,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17631,27 +17657,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17659,7 +17685,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17667,12 +17693,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17680,14 +17706,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17695,29 +17721,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17725,18 +17751,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17745,12 +17771,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17758,12 +17784,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17771,13 +17797,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17786,76 +17812,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17866,32 +17892,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17899,12 +17925,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17913,14 +17939,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17928,69 +17954,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -17998,12 +18024,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18012,17 +18038,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18031,31 +18057,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18065,12 +18091,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18078,14 +18104,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18093,14 +18119,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18108,7 +18134,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18117,7 +18143,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18126,48 +18152,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18176,7 +18202,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18186,22 +18212,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18209,7 +18235,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18219,7 +18245,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18227,29 +18253,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18257,19 +18283,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18277,7 +18303,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18285,31 +18311,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18318,12 +18344,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18331,12 +18357,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18344,63 +18370,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr "Иҷроиш:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18408,12 +18434,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18421,36 +18447,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18463,12 +18489,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18477,50 +18503,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 6c3428a70..404231137 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2018-06-24 07:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -679,7 +679,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1388,41 +1388,42 @@ msgstr "Ця програма повертає:"
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1643,7 +1644,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1734,7 +1735,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -2095,7 +2096,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -2119,7 +2120,7 @@ msgstr "АВТОРИ"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -2141,7 +2142,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3788,7 +3789,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3816,7 +3817,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3844,7 +3845,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -10265,13 +10266,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr "© Red Hat Inc., 2016"
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -10299,7 +10300,7 @@ msgid "comment"
 msgstr "коментар"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -10317,10 +10318,10 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -10328,10 +10329,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -10347,10 +10348,10 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -10366,10 +10367,10 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -10383,12 +10384,13 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr "B<--append-line> ФАЙЛ:РЯДОК"
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -10399,14 +10401,15 @@ msgstr ""
 "автоматично буде дописано символ нового рядка наприкінці рядка C<РЯДОК>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 "Наприклад, (припускаємо, що у командній оболонці використовуються звичайні "
 "лапки) така команда:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -10417,7 +10420,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -10427,7 +10430,7 @@ msgstr ""
 "додано, лише якщо наявний файл ще не закінчується символом нового рядка."
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -10441,7 +10444,7 @@ msgstr ""
 "порожніх і ще не створених файлів."
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
@@ -10449,7 +10452,7 @@ msgstr ""
 "разів:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -10462,7 +10465,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
@@ -10470,7 +10473,7 @@ msgstr ""
 "конструкцією:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -10483,18 +10486,18 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr "B<--chmod> ПРАВА_ДОСТУПУ:ФАЙЛ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr "Змінити права доступу до файла C<ФАЙЛ> на C<ПРАВА_ДОСТУПУ>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -10505,12 +10508,12 @@ msgstr ""
 "скористаєтеся C<0700>, а не C<700>."
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr "B<--commands-from-file> НАЗВА_ФАЙЛА"
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
@@ -10519,7 +10522,7 @@ msgstr ""
 "рядок."
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -10527,7 +10530,7 @@ msgid ""
 msgstr "Кожен рядок містить команду налаштовування та її аргументи, наприклад:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -10542,7 +10545,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -10555,7 +10558,7 @@ msgstr ""
 "додаванням C<\\> (символу продовження) наприкінці рядка. Приклад:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -10568,7 +10571,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -10578,32 +10581,34 @@ msgstr ""
 "наче їх вказано як I<--delete /якийсь/файл> у рядку команди."
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr "B<--copy> ДЖЕРЕЛО:ПРИЗНАЧЕННЯ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr "Копіювати файли або каталоги рекурсивно у межах гостьової системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr "Не можна використовувати символи-замінники."
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr "B<--copy-in> ЛОКАЛЬНИЙ_ШЛЯХ:ВІДДАЛЕНИЙ_КАТАЛОГ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -10613,12 +10618,12 @@ msgstr ""
 "розташувавши його у каталозі C<ВІДДАЛЕНИЙ_КАТАЛОГ> (який має існувати)."
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr "B<--delete> ШЛЯХ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -10628,7 +10633,7 @@ msgstr ""
 "рекурсивно)."
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -10640,7 +10645,7 @@ msgstr ""
 "потрібно. Приклад:"
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -10651,24 +10656,24 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr "Див. також I<--upload>, I<--scrub>."
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr "B<--edit> ФАЙЛ:ВИРАЗ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr "Редагувати C<ФАЙЛ> з використанням виразу Perl C<ВИРАЗ>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -10678,7 +10683,7 @@ msgstr ""
 "зміні у командній оболонці."
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
@@ -10686,18 +10691,18 @@ msgstr ""
 "Perl 5."
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr "Див. L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr "B<--firstboot> СКРИПТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -10708,7 +10713,7 @@ msgstr ""
 "завантаження)."
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
@@ -10716,7 +10721,7 @@ msgstr ""
 "застосовано команду chmod +x."
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -10726,8 +10731,8 @@ msgstr ""
 "включає команду у однорядковому скрипті."
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -10738,8 +10743,8 @@ msgstr ""
 "самому порядку, у якому їх вказано у рядку команди."
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -10751,20 +10756,20 @@ msgstr ""
 "завантаження і проблемами у їх використанні."
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr "Див. також I<--run>."
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr "B<--firstboot-command> 'КОМАНДА+ПАРАМЕТРИ'"
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -10775,12 +10780,12 @@ msgstr ""
 "завантаження)."
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr "B<--firstboot-install> ПАКУНОК,ПАКУНОК.."
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -10793,8 +10798,8 @@ msgstr ""
 "yum тощо) і з'єднання із мережею гостьової системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -10805,12 +10810,12 @@ msgstr ""
 "builder(1)/ВСТАНОВЛЕННЯ ПАКУНКІВ>."
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr "B<--hostname> НАЗВА_ВУЗЛА"
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -10821,12 +10826,12 @@ msgstr ""
 "назва_домену» (FQDN)."
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr "B<--install> ПАКУНОК,ПАКУНОК.."
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -10839,18 +10844,18 @@ msgstr ""
 "із мережею основної системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr "Див. також I<--update>, I<--uninstall>."
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr "B<--link> ПРИЗНАЧЕННЯ:ПОСИЛАННЯ[:ПОСИЛАННЯ..]"
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -10860,18 +10865,18 @@ msgstr ""
 "щоб вони з C<ПОСИЛАННЯ> вказували на C<ПРИЗНАЧЕННЯ>."
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr "B<--mkdir> КАТАЛОГ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr "Створити каталог у гостьовій системі."
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -10881,23 +10886,23 @@ msgstr ""
 "Також команда працює, якщо каталог вже існує."
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr "B<--move> ДЖЕРЕЛО:ПРИЗНАЧЕННЯ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr "Пересунути файли або каталоги у межах гостьової системи."
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr "B<--no-logfile>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -10909,18 +10914,18 @@ msgstr ""
 "зібрано образ, скористайтеся цим параметром."
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr "Див. також L</LOG FILE>."
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr "B<--password> КОРИСТУВАЧ:ВАРІАНТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -10930,8 +10935,8 @@ msgstr ""
 "цього параметра I<не можна> створювати облікові записи користувачів.)"
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -10942,12 +10947,12 @@ msgstr ""
 "користувачів описано у розділі L<virt-builder(1)/КОРИСТУВАЧІ І ПАРОЛІ>."
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr "B<--password-crypto> md5|sha256|sha512"
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -10958,7 +10963,7 @@ msgstr ""
 "C<md5>, C<sha256> або C<sha512>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -10968,7 +10973,7 @@ msgstr ""
 "E<ge> 2.7 (перевірте у crypt(3) всередині гостьової системи)."
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -10978,7 +10983,7 @@ msgstr ""
 "(наприкладRHEL 3), але є незахищеним щодо новітніх способів атак."
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -10992,7 +10997,7 @@ msgstr ""
 "спосіб шифрування."
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -11007,18 +11012,18 @@ msgstr ""
 "(Fedora, RHEL) або C</etc/pam.d/common-password> (Debian, Ubuntu)."
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr "B<--root-password> ВАРІАНТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr "Встановити пароль користувача root."
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -11028,12 +11033,12 @@ msgstr ""
 "гостьової системи буде використано I<випадковий> пароль root."
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr "B<--run> СКРИПТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -11045,14 +11050,14 @@ msgstr ""
 "допоміжній системі, у пісочниці гостьової файлової системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr "Для скрипту буде автоматично використано команду chmod +x."
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -11070,7 +11075,7 @@ msgstr ""
 "даними (I<--upload>)."
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -11080,20 +11085,20 @@ msgstr ""
 "порядку, у якому їх вказано у рядку команди."
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr "Див. також I<--firstboot>, I<--attach>, I<--upload>."
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr "B<--run-command> 'КОМАНДА+ПАРАМЕТРИ'"
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -11104,7 +11109,7 @@ msgstr ""
 "файлової системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -11114,36 +11119,36 @@ msgstr ""
 "самому порядку, у якому їх вказано у рядку команди."
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr "B<--scrub> ФАЙЛ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 "Витерти файл з гостьової системи. Подібне до I<--delete>, окрім того, що:"
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr "Витирає дані так, що їх не можна буде відновити з гостьової системи."
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr "Не може вилучати каталоги, лише звичайні файли."
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
@@ -11151,7 +11156,7 @@ msgstr ""
 "правильними з точки зору SELinux."
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -11164,7 +11169,7 @@ msgstr ""
 "наступне завантаження образу."
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
@@ -11172,20 +11177,20 @@ msgstr ""
 "підтримкою SELinux."
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr "B<--sm-attach> ВАРІАНТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 "Долучити систему до буфера передплати за допомогою C<subscription-manager>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -11196,41 +11201,41 @@ msgstr ""
 "MANAGER>."
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr "B<--sm-credentials> ВАРІАНТ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr "Встановити реєстраційні дані для C<subscription-manager>."
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr "B<--sm-register>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr "Зареєструвати гостьову систему за допомогою C<subscription-manager>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 "Потребує встановлення реєстраційних даних за допомогою I<--sm-credentials>."
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr "B<--sm-remove>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
@@ -11239,24 +11244,24 @@ msgstr ""
 "manager>."
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr "B<--sm-unregister>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 "Зняти гостьову систему з реєстрації за допомогою C<subscription-manager>."
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr "B<--ssh-inject> КОРИСТУВАЧ[:ВАРІАНТ]"
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -11267,14 +11272,14 @@ msgstr ""
 "C<КОРИСТУВАЧ> має вже існувати у гостьовій системі."
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr "Формат поля C<ВАРІАНТ> описано у розділі L<virt-builder(1)/КЛЮЧІ SSH>."
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -11285,12 +11290,12 @@ msgstr ""
 "користувачів."
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timezone> ЧАСОВИЙ_ПОЯС"
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -11300,23 +11305,23 @@ msgstr ""
 "C<ЧАСОВИЙ_ПОЯС>. Скористайтеся рядком місця у форматі C<Europe/London>"
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr "B<--touch> ФАЙЛ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr "Ця команда виконує подібну до L<touch(1)> дію над файлом C<ФАЙЛ>."
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr "B<--truncate> ФАЙЛ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -11326,12 +11331,12 @@ msgstr ""
 "виконання файл має існувати."
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr "B<--truncate-recursive> ШЛЯХ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
@@ -11340,12 +11345,12 @@ msgstr ""
 "довжини."
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr "B<--uninstall> ПАКУНОК,ПАКУНОК.."
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -11360,18 +11365,18 @@ msgstr ""
 "пакунків."
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr "Див. також I<--install>, I<--update>."
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr "B<--update>"
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -11383,18 +11388,18 @@ msgstr ""
 "до найсвіжіших версій."
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr "Див. також I<--install>, I<--uninstall>."
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr "B<--upload> ФАЙЛ:ПРИЗНАЧЕННЯ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -11406,7 +11411,7 @@ msgstr ""
 "значення для цих параметрів, які мають бути на остаточному образі диска."
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -11416,7 +11421,7 @@ msgstr ""
 "можна скористатися для перейменовування файла під час вивантаження."
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -11428,18 +11433,18 @@ msgstr ""
 "назву файла з локальної файлової системи буде збережено."
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr "Див. також I<--mkdir>, I<--delete>, I<--scrub>."
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr "B<--write> ФАЙЛ:ДАНІ"
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr "Записати C<ДАНІ> до файла C<ФАЙЛ>."
@@ -15444,7 +15449,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -20204,11 +20209,24 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
+#, fuzzy
+#| msgid "F<common/mlutils>"
+msgid "F<common/mlcustomize>"
+msgstr "F<common/mlutils>"
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:104
+msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
 msgid "F<common/mlgettext>"
 msgstr "F<common/mlgettext>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:104
+#: ../docs/guestfs-hacking.pod:109
 msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
@@ -20218,12 +20236,12 @@ msgstr ""
 "configure>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr "F<common/mlpcre>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
@@ -20233,34 +20251,34 @@ msgstr ""
 "бібліотекою ocaml-pcre, яку створив Markus Mottl."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr "F<common/mlprogress>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr "Прив'язки OCaml до функцій смужки поступу (див. F<common/progress>)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr "F<common/mlstdutils>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 "Бібліотека допоміжних функцій, які використовуються у багатьох місцях, суто "
 "мовою OCaml."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr "F<common/mltools>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
@@ -20269,12 +20287,12 @@ msgstr ""
 "віртуалізації мовою OCaml (зокрема C<virt-sysprep>, C<virt-v2v> тощо)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr "F<common/mlutils>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
@@ -20283,64 +20301,76 @@ msgstr ""
 "яких немає у стандартній бібліотеці OCaml."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+#, fuzzy
+#| msgid "F<common/mlvisit>"
+msgid "F<common/mlv2v>"
+msgstr "F<common/mlvisit>"
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr "F<common/mlvisit>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr "Прив'язки до OCaml для функцій visit (див. F<common/visit>)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr "F<common/mlxml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr "Прив'язки OCaml для бібліотеки libxml2."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr "F<common/options>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 "Загальна обробка параметрів для guestfish, guestmount та деяких інструментів "
 "віртуалізації."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr "F<common/parallel>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr "Комплект бібліотек для паралельної обробки декількох доменів libvirt."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr "F<common/progress>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr "Загальний код для виведення смужок поступу."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr "F<common/protocol>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
@@ -20350,23 +20380,23 @@ msgstr ""
 "системі."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr "F<common/qemuopts>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 "Мінібібліотека для запису рядків команд qemu та файлів налаштувань qemu."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr "F<common/structs>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
@@ -20375,64 +20405,64 @@ msgstr ""
 "використовується у бібліотеці та деяких інструментах."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr "F<common/utils>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 "Різноманітні допоміжні функції, які використовуються у бібліотеці та "
 "інструментах."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr "F<common/visit>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr "Рекурсивний обхід ієрархії файлових систем guestfs."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr "F<common/windows>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr "Допоміжні функції для обробки літер дисків у Windows."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr "F<contrib>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr "Зовнішні внески, експериментальні частини."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr "F<customize>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr "Програма L<virt-customize(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr "F<daemon>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
@@ -20440,72 +20470,72 @@ msgstr ""
 "виконання дій."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr "F<df>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr "Програма L<virt-df(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr "F<dib>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr "Програма L<virt-dib(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr "F<diff>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr "Програма L<virt-diff(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr "F<docs>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr "Різноманітні сторінки підручника."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr "F<edit>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr "Програма L<virt-edit(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr "F<examples>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr "Код прикладів використання програмного інтерфейсу мовою C."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr "F<fish>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -20516,22 +20546,22 @@ msgstr ""
 "in(1)>, L<virt-tar-out(1)>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr "F<format>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr "Програма L<virt-format(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr "F<fuse>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
@@ -20539,12 +20569,12 @@ msgstr ""
 "на основі libguestfs."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr "F<generator>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
@@ -20554,22 +20584,22 @@ msgstr ""
 "прив'язок."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr "F<get-kernel>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr "Програма L<virt-get-kernel(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr "F<gnulib>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
@@ -20578,72 +20608,72 @@ msgstr ""
 "каталогу включено копію gnulib."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr "F<inspector>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr "L<virt-inspector(1)> — засіб інспектування образів віртуальних машин."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr "F<lib>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr "Початковий код бібліотеки мовою C."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr "F<logo>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr "Логотип, який використовується на сайті. До речі, ім'я рибки — Артур."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr "F<m4>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr "Макроси M4, які використовуються autoconf. Див. L</СИСТЕМА ЗБИРАННЯ>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr "F<make-fs>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr "Програма L<virt-make-fs(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr "F<po>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr "Переклади простих рядків gettext."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr "F<po-docs>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -20654,72 +20684,72 @@ msgstr ""
 "складним."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr "F<rescue>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr "Програма L<virt-rescue(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr "F<resize>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr "Програма L<virt-resize(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr "F<sparsify>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr "Програма L<virt-sparsify(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr "F<sysprep>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr "Програма L<virt-sysprep(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr "F<tests>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr "Тести."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr "F<test-data>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr "Файли та інші тестові дані, які використовуються при тестуванні."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr "F<test-tool>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
@@ -20728,12 +20758,12 @@ msgstr ""
 "працюватиме їхня комбінація qemu/ядро з libguestfs."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr "F<tmp>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -20746,12 +20776,12 @@ msgstr ""
 "створено базову систему."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr "F<tools>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
@@ -20759,107 +20789,107 @@ msgstr ""
 "reg(1)> та багато інших)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr "F<utils>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr "Різноманітні допоміжні програми, зокрема C<boot-benchmark>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr "F<v2v>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr "Програма L<virt-v2v(1)> та документація до неї."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr "F<website>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr "Файли сайта L<http://libguestfs.org>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr "F<csharp>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr "F<erlang>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr "F<gobject>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr "F<golang>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr "F<haskell>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr "F<java>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr "F<lua>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr "F<ocaml>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr "F<php>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr "F<perl>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr "F<python>"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr "F<ruby>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr "Прив’язки до мов програмування."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr "СИСТЕМА ЗБИРАННЯ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
@@ -20867,7 +20897,7 @@ msgstr ""
 "libtool)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -20880,7 +20910,7 @@ msgstr ""
 "m4> призначено для обробки залежностей фонової служби (daemon)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
@@ -20889,7 +20919,7 @@ msgstr ""
 "підкаталогів (C<SUBDIRS>) у порядку їхнього збирання."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -20900,13 +20930,13 @@ msgstr ""
 "F<Makefile.am> у підкаталогах."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 "Цілей збирання багато. Скористайтеся цією командою, щоб побачити список:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -20916,17 +20946,17 @@ msgstr ""
 "\n"
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr "РОЗШИРЕННЯ МОЖЛИВОСТЕЙ LIBGUESTFS"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr "ДОДАВАННЯ НОВИХ ПРОГРАМНИХ ІНТЕРФЕЙСІВ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
@@ -20936,12 +20966,12 @@ msgstr ""
 "просто."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr "Щоб додати нову дію програмного інтерфейсу, слід внести дві зміни:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -20952,7 +20982,7 @@ msgstr ""
 "до F<generator/proc_nr.ml>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -20972,7 +21002,7 @@ msgstr ""
 "боці бібліотеки."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -20988,7 +21018,7 @@ msgstr ""
 "ваш номер."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -21002,12 +21032,12 @@ msgstr ""
 "номеру процедури; отже, для них встановлюється номер процедури C<-1>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr "Реалізація дії (мовою C):"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
@@ -21016,7 +21046,7 @@ msgstr ""
 "каталозі C<daemon/>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
@@ -21025,13 +21055,13 @@ msgstr ""
 "у каталозі C<lib/>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 "У обох випадках скористайтеся якоюсь іншою функцією як прикладом реалізації."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -21042,12 +21072,12 @@ msgstr ""
 "OCaml ...> у генераторі. Прикладом може слугувати файл F<daemon/file.ml>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr "Після внесення цих змін скористайтеся командою C<make> для збирання."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -21058,12 +21088,12 @@ msgstr ""
 "OCaml."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr "Додавання тестів для програмного інтерфейсу"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -21079,7 +21109,7 @@ msgstr ""
 "першим зі способів."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
@@ -21088,27 +21118,27 @@ msgstr ""
 "програмного інтерфейсу до F<actions_*.ml>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr "У середовищі тестування 4 блокових пристрої:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr "F</dev/sda> 2 ГБ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr "Блоковий пристрій загального типу для тестування."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr "F</dev/sdb> 2 ГБ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
@@ -21117,27 +21147,27 @@ msgstr ""
 "із запису до файлової системи."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr "F</dev/sdc> 10 МБ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr "Використовується для тестів, у яких потрібні два блокових пристрої."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr "F</dev/sdd>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr "ISO із фіксованим вмістом (див. F<images/test.iso>)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -21148,7 +21178,7 @@ msgstr ""
 "намагайтеся тестувати L<guestfs(3)/guestfs_kill_subprocess> :-x"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -21163,7 +21193,7 @@ msgstr ""
 "вмісту інших дисків, які не ініціалізовано."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -21178,7 +21208,7 @@ msgstr ""
 "C<Always>, запускається безумовно."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
@@ -21187,7 +21217,7 @@ msgstr ""
 "відповідних змінних середовища до запуску C<make check>."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -21197,7 +21227,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
@@ -21205,7 +21235,7 @@ msgstr ""
 "L<guestfs(3)/guestfs_command>."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -21215,7 +21245,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
@@ -21223,14 +21253,14 @@ msgstr ""
 "L<guestfs(3)/guestfs_zerofree>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 "Пакувальники можуть обмежити тестування певним набором тестів, встановлюючи, "
 "наприклад, таке:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -21240,7 +21270,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
@@ -21249,22 +21279,22 @@ msgstr ""
 "змінні середовища."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr "Діагностика нових програмних інтерфейсів"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr "Перевірте нові можливості, перш ніж записувати їх до сховища коду."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr "Для перевірки нових команд ви можете скористатися guestfish."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -21276,12 +21306,12 @@ msgstr ""
 "можна буде переглядати за допомогою C<guestfish -v>."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr "ДОДАВАННЯ НОВОЇ ПРИВ’ЯЗКИ ДО МОВИ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
@@ -21290,7 +21320,7 @@ msgstr ""
 "F<generator>)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
@@ -21300,12 +21330,12 @@ msgstr ""
 "ml>."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr "Додавання тестів для прив'язок до мов"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -21316,7 +21346,7 @@ msgstr ""
 "тестів, які має використовувати кожна прив'язка до мови."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -21327,12 +21357,12 @@ msgstr ""
 "тести саме для OCaml."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr "Ось схема нумерації, яка використовується у тестах:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -21342,7 +21372,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -21370,7 +21400,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -21380,7 +21410,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -21390,7 +21420,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -21404,7 +21434,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -21414,7 +21444,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -21424,7 +21454,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
@@ -21433,12 +21463,12 @@ msgstr ""
 "лише 100, 430, 800+, 900+."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr "ФОРМАТУВАННЯ КОДУ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -21454,14 +21484,14 @@ msgstr ""
 "аспектах форматування слідуйте стилю книги Кернігана та Річі."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -21487,7 +21517,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -21517,12 +21547,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr "ТЕСТУВАННЯ ВНЕСЕНИХ ВАМИ ЗМІН"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
@@ -21530,7 +21560,7 @@ msgstr ""
 "ці попередження не ігнорувалися:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -21540,22 +21570,22 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr "Корисні цілі збирання:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr "C<make check>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr "Запускає звичайний комплект перевірок."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
@@ -21564,27 +21594,27 @@ msgstr ""
 "ціль можна дізнатися з документації до automake."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr "C<make check-valgrind>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr "Запускає підмножину комплекту тестування у valgrind."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr "Див. L</VALGRIND> нижче."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr "C<make check-valgrind-local-guests>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
@@ -21593,12 +21623,12 @@ msgstr ""
 "встановлених гостьових систем libvirt (лише для читання)."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr "C<make check-direct>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -21609,12 +21639,12 @@ msgstr ""
 "було вибрано нетиповий модуль."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr "C<make check-valgrind-direct>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
@@ -21623,17 +21653,17 @@ msgstr ""
 "використанням типового модуля базової системи."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr "C<make check-uml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr "Виконує усі тести з використанням модуля режиму користувача у Linux."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
@@ -21643,7 +21673,7 @@ msgstr ""
 "щоб воно вказувало на образ ядра. Приклад:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -21653,31 +21683,31 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr "C<make check-valgrind-uml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 "Виконує усі тести з використанням модуля режиму користувача Linux під "
 "керуванням valgrind."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 "Як і вище, вам слід встановити значення C<LIBGUESTFS_HV> так, щоб воно "
 "вказувало на ядро."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr "C<make check-with-upstream-qemu>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -21689,7 +21719,7 @@ msgstr ""
 "Приклад:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -21699,12 +21729,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr "C<make check-with-upstream-libvirt>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -21715,7 +21745,7 @@ msgstr ""
 "libvirt."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
@@ -21724,7 +21754,7 @@ msgstr ""
 "libvirt>), але ви можете вказати інший каталог у рядку команди. Приклад:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -21734,24 +21764,24 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr "C<make check-slow>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 "Запускає повільні тести або тести, які виконуються довго. Такі тести типово "
 "не запускаються."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr "Щоб позначити тест як повільний або такий, який виконується довго:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
@@ -21759,7 +21789,7 @@ msgstr ""
 "Додайте це до списку C<TESTS> у F<Makefile.am>, подібно до звичайного тесту."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -21771,7 +21801,7 @@ msgstr ""
 "для цього ви можете викликати функцію C<slow_test>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
@@ -21779,12 +21809,12 @@ msgstr ""
 "повільних тестів."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr "Додайте таке правило до F<Makefile.am>:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -21796,12 +21826,12 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr "C<sudo make check-root>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -21813,12 +21843,12 @@ msgstr ""
 "допомогою явного використання L<sudo(8)>)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr "Щоб позначити тест як такий, що вимагає прав доступу користувача root:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -21830,7 +21860,7 @@ msgstr ""
 "C<root_test> для цього."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
@@ -21838,7 +21868,7 @@ msgstr ""
 "тестів для root."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -21850,22 +21880,22 @@ msgstr ""
 "\n"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr "C<make check-all>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr "Еквівалент запуску усіх правил C<make check*>, окрім C<check-root>."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr "C<make check-release>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
@@ -21874,42 +21904,42 @@ msgstr ""
 "архіву tar. У поточній версії це:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr "check"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr "check-valgrind"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr "check-direct"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr "check-valgrind-direct"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr "check-slow"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr "C<make installcheck>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr "Запустити C<make check> для встановленої копії libguestfs."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
@@ -21918,12 +21948,12 @@ msgstr ""
 "ієрархії початкового коду libguestfs мають збігатися."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr "Команди:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -21939,12 +21969,12 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr "VALGRIND"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
@@ -21954,7 +21984,7 @@ msgstr ""
 "запуск."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
@@ -21963,7 +21993,7 @@ msgstr ""
 "паралельним тестуванням automake, не так уже і просто."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
@@ -21971,7 +22001,7 @@ msgstr ""
 "оболонки, у обгортці слід скористатися таким кодом:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -21981,12 +22011,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr "а у F<Makefile.am> слід вказати:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -21998,7 +22028,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
@@ -22007,7 +22037,7 @@ msgstr ""
 "C<TESTS>, до F<Makefile.am> слід внести такий рядок:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -22017,7 +22047,7 @@ msgstr ""
 " \n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
@@ -22026,12 +22056,12 @@ msgstr ""
 "тестуєте, шляхом уважного вивчення файлів журналу F<tmp/valgrind*>."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr "НАДСИЛАННЯ ЛАТОК"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
@@ -22040,7 +22070,7 @@ msgstr ""
 "listinfo/libguestfs> і копію повідомлення до L<rjones@redhat.com>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
@@ -22050,12 +22080,12 @@ msgstr ""
 "потрібною на модерацію."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr "НЕТИПОВІ ЗАСОБИ ФОРМАТУВАННЯ PRINTF У ФОНОВІЙ СЛУЖБІ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
@@ -22065,12 +22095,12 @@ msgstr ""
 "оболонці."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr "%Q"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
@@ -22079,12 +22109,12 @@ msgstr ""
 "пробілів та інших керівних символів оболонки."
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr "%R"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
@@ -22092,7 +22122,7 @@ msgstr ""
 "Те саме, що і C<%Q>, але рядок вважатиметься шляхом із префіксом sysroot."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -22102,12 +22132,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr "дасть C<cat /sysroot/якийсь\\ шлях\\ із\\ пробілами>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -22121,19 +22151,19 @@ msgstr ""
 "використовувати функцію C<sysroot_path()>."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr "ПІДТРИМКА ІНТЕРНАЦІОНАЛІЗАЦІЇ (I18N)"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 "У нашій бібліотеці передбачено можливість інтернаціоналізації (засобами "
 "gettext)."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -22147,7 +22177,7 @@ msgstr ""
 "наші файли PO до базової системи."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
@@ -22156,17 +22186,17 @@ msgstr ""
 "програмістів."
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr "ІНШІ ТЕМИ"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr "ЯК КОМПІЛЮЮТЬСЯ І КОМПОНУЮТЬСЯ ПРОГРАМИ OCAML"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
@@ -22175,7 +22205,7 @@ msgstr ""
 "ocamlopt працювати разом», оскільки самі програми OCaml зібрати легко."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -22190,12 +22220,12 @@ msgstr ""
 "файли C для природних прив'язок до бібліотек тощо."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr "Отже, типова програма описується як список файлів з її кодом мовою C:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -22205,7 +22235,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
@@ -22214,7 +22244,7 @@ msgstr ""
 "порожній файл F<dummy.c> і додаємо його до списку замість справжніх файлів:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -22224,7 +22254,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
@@ -22233,7 +22263,7 @@ msgstr ""
 "залежності automake (інші залежності також можуть потрапляти до списку):"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -22243,7 +22273,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -22256,7 +22286,7 @@ msgstr ""
 "належному порядку."
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -22268,7 +22298,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
@@ -22277,17 +22307,17 @@ msgstr ""
 "є дещо складнішими за ці, оскільки у них ще треба обробити:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr "Компіляцію у байткод або природний код системи."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr "Взірцеві правила, потрібні для збирання коду OCaml у об'єкти."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
@@ -22296,12 +22326,12 @@ msgstr ""
 "ієрархії коду. Цей файл включається до усіх підкаталогів F<Makefile.am>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr "Додавання файлів початкового коду OCaml до C<EXTRA_DIST>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
@@ -22310,12 +22340,12 @@ msgstr ""
 "файла, тому програма не зможе додати відповідні файли автоматично."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr "VIRT-V2V"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -22329,7 +22359,7 @@ msgstr ""
 "git/virt-v2v.git>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -22343,22 +22373,22 @@ msgstr ""
 "перетворення гостьових систем), вам може допомогти читання коду мовою Perl."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr "Ось файли, з яких варто розпочати читання цього коду:"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr "F<types.mli>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr "F<v2v.ml>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -22369,7 +22399,7 @@ msgstr ""
 "ml> реалізовано керування роботою програми на різних етапах."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -22385,7 +22415,7 @@ msgstr ""
 "працювати і які конкретно кроки слід виконати для їхнього перетворення."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -22396,17 +22426,17 @@ msgstr ""
 "використати зовнішні бібліотеки C, зокрема libxml2."
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr "ЗАВДАННЯ ІЗ СУПРОВОДУ"
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr "ЦІЛІ ДЛЯ СУПРОВІДНИКІВ У MAKEFILE"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
@@ -22415,12 +22445,12 @@ msgstr ""
 "не є супровідником пакунків libguestfs."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr "make maintainer-commit"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -22432,12 +22462,12 @@ msgstr ""
 "збирання."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr "make maintainer-tag"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
@@ -22446,7 +22476,7 @@ msgstr ""
 "$(VERSION)> і одним із таких повідомлень:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -22456,7 +22486,7 @@ msgstr ""
 "\n"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -22466,7 +22496,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
@@ -22475,12 +22505,12 @@ msgstr ""
 "розробці, наведено у розділі L<guestfs(3)/НУМЕРАЦІЯ ВЕРСІЙ LIBGUESTFS>.)"
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr "make maintainer-check-authors"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
@@ -22489,12 +22519,12 @@ msgstr ""
 "внесків до git) включено до файла F<generator/authors.ml>."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr "make maintainer-check-extra-dist"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -22507,12 +22537,12 @@ msgstr ""
 "F<Makefile.am>."
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr "make maintainer-upload-website"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -22523,12 +22553,12 @@ msgstr ""
 "вивантаження на вебсервер."
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr "СТВОРЕННЯ СТАБІЛЬНОГО ВИПУСКУ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -22539,63 +22569,63 @@ msgstr ""
 "НУМЕРАЦІЯ ВЕРСІЙ LIBGUESTFS>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr "Перевірте, чи працює C<make && make check> принаймні у таких системах:"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr "Fedora (x86-64)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr "Debian (x86-64)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr "Ubuntu (x86-64)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr "Fedora (aarch64)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr "Fedora (ppc64)"
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr "Fedora (ppc64le)"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr "Перевірте, чи працює C<./configure --without-libvirt>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr "Внесіть завершальні зміни до F<guestfs-release-notes.pod>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr "Надіслати і отримати дані з Zanata."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr "Віддайте команду:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -22605,12 +22635,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr "щоб надіслати найсвіжіші файли POT на Zanata. Потім віддайте команду:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -22620,18 +22650,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 "яка є обгорткою для команд отримання найсвіжіших перекладених файлів F<*.po>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr "Оновіть gnulib до найсвіжішої версії основної гілки розробки."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
@@ -22640,12 +22670,12 @@ msgstr ""
 "libguestfs.org/download>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr "Внесіть зміни до F<website/index.html.in>."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
@@ -22654,7 +22684,7 @@ msgstr ""
 "тобто 1.XX.0, і запишіть версію:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -22674,12 +22704,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr "Створіть стабільну гілку у git:"
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -22691,12 +22721,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr "Виконайте повноцінний випуск стабільної гілки."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
@@ -22705,12 +22735,12 @@ msgstr ""
 "сховища. Можна також створити повноцінний випуск із гілки для розробки."
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr "ВНУТРІШНЯ ДОКУМЕНТАЦІЯ"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
@@ -22720,7 +22750,7 @@ msgstr ""
 "розробників libguestfs."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
@@ -22729,7 +22759,7 @@ msgstr ""
 "початкового коду, які форматовано для використання у форматі POD."
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
@@ -22738,12 +22768,12 @@ msgstr ""
 "вилучено у будь-якій новішій версії.>"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr "__INTERNAL_DOCUMENTATION__"
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po-docs/zh_CN.po b/po-docs/zh_CN.po
index 8909d17c7..3c91ce120 100644
--- a/po-docs/zh_CN.po
+++ b/po-docs/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-07-24 08:04+0000\n"
 "Last-Translator: cheng ye <18969068329@163.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -599,7 +599,7 @@ msgstr ""
 #: ../cat/virt-log.pod:93 ../cat/virt-ls.pod:331 ../cat/virt-tail.pod:111
 #: ../customize/virt-customize.pod:126 ../df/virt-df.pod:128
 #: ../diff/virt-diff.pod:148 ../docs/guestfs-building.pod:481
-#: ../docs/guestfs-hacking.pod:850 ../docs/guestfs-recipes.pod:508
+#: ../docs/guestfs-hacking.pod:859 ../docs/guestfs-recipes.pod:508
 #: ../docs/internal-documentation.pod:3071 ../edit/virt-edit.pod:141
 #: ../fish/guestfish.pod:236 ../fish/guestfish.pod:720
 #: ../format/virt-format.pod:100 ../inspector/virt-inspector.pod:363
@@ -1180,41 +1180,42 @@ msgstr ""
 #: ../cat/virt-cat.pod:258 ../cat/virt-tail.pod:25 ../cat/virt-tail.pod:29
 #: ../cat/virt-tail.pod:34 ../cat/virt-tail.pod:217 ../cat/virt-tail.pod:222
 #: ../cat/virt-tail.pod:227 ../cat/virt-tail.pod:238 ../cat/virt-tail.pod:242
-#: ../customize/customize-options.pod:290
-#: ../customize/customize-options.pod:294 ../docs/guestfs-building.pod:13
-#: ../docs/guestfs-building.pod:17 ../docs/guestfs-building.pod:21
-#: ../docs/guestfs-building.pod:25 ../docs/guestfs-building.pod:798
-#: ../docs/guestfs-building.pod:803 ../docs/guestfs-faq.pod:188
-#: ../docs/guestfs-faq.pod:194 ../docs/guestfs-faq.pod:198
-#: ../docs/guestfs-faq.pod:203 ../docs/guestfs-faq.pod:768
-#: ../docs/guestfs-faq.pod:774 ../docs/guestfs-faq.pod:813
-#: ../docs/guestfs-faq.pod:819 ../docs/guestfs-faq.pod:1381
-#: ../docs/guestfs-faq.pod:1392 ../docs/guestfs-faq.pod:1397
-#: ../docs/guestfs-hacking.pod:683 ../docs/guestfs-hacking.pod:688
-#: ../docs/guestfs-hacking.pod:695 ../docs/guestfs-hacking.pod:700
-#: ../docs/guestfs-hacking.pod:719 ../docs/guestfs-hacking.pod:724
-#: ../docs/guestfs-hacking.pod:730 ../docs/guestfs-hacking.pod:735
-#: ../docs/guestfs-hacking.pod:755 ../docs/guestfs-hacking.pod:759
-#: ../docs/guestfs-hacking.pod:763 ../docs/guestfs-hacking.pod:767
-#: ../docs/guestfs-hacking.pod:771 ../docs/guestfs-hacking.pod:915
-#: ../docs/guestfs-hacking.pod:919 ../docs/guestfs-hacking.pod:926
-#: ../docs/guestfs-hacking.pod:953 ../docs/guestfs-hacking.pod:957
-#: ../docs/guestfs-hacking.pod:1029 ../docs/guestfs-hacking.pod:1049
-#: ../docs/guestfs-hacking.pod:1053 ../docs/guestfs-hacking.pod:1057
-#: ../docs/guestfs-hacking.pod:1071 ../docs/guestfs-hacking.pod:1075
-#: ../docs/guestfs-hacking.pod:1080 ../docs/guestfs-hacking.pod:1084
-#: ../docs/guestfs-hacking.pod:1096 ../docs/guestfs-hacking.pod:1103
-#: ../docs/guestfs-hacking.pod:1107 ../docs/guestfs-performance.pod:116
-#: ../docs/guestfs-performance.pod:122 ../docs/guestfs-performance.pod:127
-#: ../docs/guestfs-performance.pod:254 ../docs/guestfs-performance.pod:259
-#: ../docs/guestfs-performance.pod:264 ../docs/guestfs-performance.pod:384
-#: ../docs/guestfs-performance.pod:388 ../docs/guestfs-performance.pod:394
-#: ../docs/guestfs-performance.pod:400 ../docs/guestfs-recipes.pod:280
-#: ../docs/guestfs-recipes.pod:284 ../docs/guestfs-recipes.pod:288
-#: ../docs/guestfs-recipes.pod:314 ../docs/guestfs-recipes.pod:319
-#: ../docs/guestfs-recipes.pod:426 ../docs/guestfs-recipes.pod:430
-#: ../docs/guestfs-recipes.pod:434 ../docs/guestfs-recipes.pod:438
-#: ../docs/guestfs-recipes.pod:442 ../docs/guestfs-release-notes.pod:2378
+#: ../common/mlcustomize/customize-options.pod:290
+#: ../common/mlcustomize/customize-options.pod:294
+#: ../docs/guestfs-building.pod:13 ../docs/guestfs-building.pod:17
+#: ../docs/guestfs-building.pod:21 ../docs/guestfs-building.pod:25
+#: ../docs/guestfs-building.pod:798 ../docs/guestfs-building.pod:803
+#: ../docs/guestfs-faq.pod:188 ../docs/guestfs-faq.pod:194
+#: ../docs/guestfs-faq.pod:198 ../docs/guestfs-faq.pod:203
+#: ../docs/guestfs-faq.pod:768 ../docs/guestfs-faq.pod:774
+#: ../docs/guestfs-faq.pod:813 ../docs/guestfs-faq.pod:819
+#: ../docs/guestfs-faq.pod:1381 ../docs/guestfs-faq.pod:1392
+#: ../docs/guestfs-faq.pod:1397 ../docs/guestfs-hacking.pod:692
+#: ../docs/guestfs-hacking.pod:697 ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:709 ../docs/guestfs-hacking.pod:728
+#: ../docs/guestfs-hacking.pod:733 ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:744 ../docs/guestfs-hacking.pod:764
+#: ../docs/guestfs-hacking.pod:768 ../docs/guestfs-hacking.pod:772
+#: ../docs/guestfs-hacking.pod:776 ../docs/guestfs-hacking.pod:780
+#: ../docs/guestfs-hacking.pod:924 ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:935 ../docs/guestfs-hacking.pod:962
+#: ../docs/guestfs-hacking.pod:966 ../docs/guestfs-hacking.pod:1038
+#: ../docs/guestfs-hacking.pod:1058 ../docs/guestfs-hacking.pod:1062
+#: ../docs/guestfs-hacking.pod:1066 ../docs/guestfs-hacking.pod:1080
+#: ../docs/guestfs-hacking.pod:1084 ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1093 ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1112 ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-performance.pod:116 ../docs/guestfs-performance.pod:122
+#: ../docs/guestfs-performance.pod:127 ../docs/guestfs-performance.pod:254
+#: ../docs/guestfs-performance.pod:259 ../docs/guestfs-performance.pod:264
+#: ../docs/guestfs-performance.pod:384 ../docs/guestfs-performance.pod:388
+#: ../docs/guestfs-performance.pod:394 ../docs/guestfs-performance.pod:400
+#: ../docs/guestfs-recipes.pod:280 ../docs/guestfs-recipes.pod:284
+#: ../docs/guestfs-recipes.pod:288 ../docs/guestfs-recipes.pod:314
+#: ../docs/guestfs-recipes.pod:319 ../docs/guestfs-recipes.pod:426
+#: ../docs/guestfs-recipes.pod:430 ../docs/guestfs-recipes.pod:434
+#: ../docs/guestfs-recipes.pod:438 ../docs/guestfs-recipes.pod:442
+#: ../docs/guestfs-release-notes.pod:2378
 #: ../docs/guestfs-release-notes.pod:2383
 #: ../docs/guestfs-release-notes.pod:4279
 #: ../docs/guestfs-release-notes.pod:4284
@@ -1428,7 +1429,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:303 ../daemon/guestfsd.pod:143
 #: ../df/virt-df.pod:256 ../dib/virt-dib.pod:708 ../diff/virt-diff.pod:265
 #: ../docs/guestfs-building.pod:819 ../docs/guestfs-faq.pod:1411
-#: ../docs/guestfs-hacking.pod:1127 ../docs/guestfs-internals.pod:400
+#: ../docs/guestfs-hacking.pod:1136 ../docs/guestfs-internals.pod:400
 #: ../docs/guestfs-performance.pod:615 ../docs/guestfs-recipes.pod:719
 #: ../docs/guestfs-release-notes.pod:7047 ../docs/guestfs-security.pod:409
 #: ../docs/guestfs-testing.pod:395 ../edit/virt-edit.pod:400
@@ -1517,7 +1518,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:324 ../daemon/guestfsd.pod:152
 #: ../df/virt-df.pod:268 ../dib/virt-dib.pod:719 ../diff/virt-diff.pod:279
 #: ../docs/guestfs-building.pod:836 ../docs/guestfs-faq.pod:1421
-#: ../docs/guestfs-hacking.pod:1144 ../docs/guestfs-internals.pod:413
+#: ../docs/guestfs-hacking.pod:1153 ../docs/guestfs-internals.pod:413
 #: ../docs/guestfs-performance.pod:632 ../docs/guestfs-recipes.pod:739
 #: ../docs/guestfs-release-notes.pod:7062 ../docs/guestfs-security.pod:421
 #: ../docs/guestfs-testing.pod:406 ../edit/virt-edit.pod:415
@@ -1812,7 +1813,7 @@ msgstr ""
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:148
 #: ../customize/virt-customize.pod:320 ../docs/guestfs-building.pod:832
-#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1140
+#: ../docs/guestfs-faq.pod:1417 ../docs/guestfs-hacking.pod:1149
 #: ../docs/guestfs-internals.pod:409 ../docs/guestfs-performance.pod:628
 #: ../docs/guestfs-recipes.pod:735 ../docs/guestfs-security.pod:417
 #: ../docs/guestfs-testing.pod:402 ../erlang/examples/guestfs-erlang.pod:111
@@ -1836,7 +1837,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:150
 #: ../docs/guestfs-building.pod:834 ../docs/guestfs-faq.pod:1419
-#: ../docs/guestfs-hacking.pod:1142 ../docs/guestfs-internals.pod:411
+#: ../docs/guestfs-hacking.pod:1151 ../docs/guestfs-internals.pod:411
 #: ../docs/guestfs-performance.pod:630 ../docs/guestfs-recipes.pod:737
 #: ../docs/guestfs-security.pod:419 ../docs/guestfs-testing.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:113
@@ -1858,7 +1859,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:154 ../cat/virt-ls.pod:551
 #: ../daemon/guestfsd.pod:154 ../df/virt-df.pod:270 ../diff/virt-diff.pod:281
-#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1146
+#: ../docs/guestfs-building.pod:838 ../docs/guestfs-hacking.pod:1155
 #: ../docs/guestfs-internals.pod:415 ../docs/guestfs-recipes.pod:741
 #: ../docs/guestfs-release-notes.pod:7064 ../docs/guestfs-security.pod:423
 #: ../edit/virt-edit.pod:417 ../fish/guestfish.pod:1681
@@ -3215,7 +3216,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:413 ../builder/virt-builder.pod:988
 #: ../customize/virt-customize.pod:198 ../docs/guestfs-faq.pod:494
 #: ../docs/guestfs-faq.pod:721 ../docs/guestfs-faq.pod:927
-#: ../docs/guestfs-hacking.pod:386 ../docs/guestfs-performance.pod:170
+#: ../docs/guestfs-hacking.pod:395 ../docs/guestfs-performance.pod:170
 #: ../docs/guestfs-performance.pod:212 ../docs/guestfs-recipes.pod:457
 #: ../docs/guestfs-security.pod:177 ../docs/internal-documentation.pod:156
 #: ../docs/internal-documentation.pod:267
@@ -3241,7 +3242,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:418 ../builder/virt-builder.pod:993
 #: ../customize/virt-customize.pod:203 ../docs/guestfs-faq.pod:499
 #: ../docs/guestfs-faq.pod:731 ../docs/guestfs-faq.pod:931
-#: ../docs/guestfs-hacking.pod:412 ../docs/guestfs-performance.pod:176
+#: ../docs/guestfs-hacking.pod:421 ../docs/guestfs-performance.pod:176
 #: ../docs/guestfs-performance.pod:219 ../docs/guestfs-recipes.pod:463
 #: ../docs/guestfs-security.pod:181 ../docs/internal-documentation.pod:161
 #: ../docs/internal-documentation.pod:274
@@ -3267,7 +3268,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:423 ../builder/virt-builder.pod:1003
 #: ../customize/virt-customize.pod:208 ../docs/guestfs-faq.pod:505
 #: ../docs/guestfs-faq.pod:736 ../docs/guestfs-faq.pod:935
-#: ../docs/guestfs-hacking.pod:424 ../docs/guestfs-performance.pod:225
+#: ../docs/guestfs-hacking.pod:433 ../docs/guestfs-performance.pod:225
 #: ../docs/guestfs-recipes.pod:469 ../docs/internal-documentation.pod:166
 #: ../docs/internal-documentation.pod:284
 #: ../docs/internal-documentation.pod:1331
@@ -8458,13 +8459,13 @@ msgid "Copyright (C) 2016 Red Hat Inc."
 msgstr ""
 
 #. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:25
-#: ../docs/guestfs-recipes.pod:1 ../docs/guestfs-recipes.pod:6
-#: ../docs/guestfs-release-notes.pod:5 ../docs/guestfs-release-notes.pod:9
-#: ../docs/guestfs-release-notes.pod:11 ../docs/guestfs-release-notes.pod:18
-#: ../docs/guestfs-release-notes.pod:221 ../docs/guestfs-release-notes.pod:225
-#: ../docs/guestfs-release-notes.pod:753 ../docs/guestfs-release-notes.pod:757
-#: ../docs/guestfs-release-notes.pod:1362
+#: ../common/mlcustomize/customize-options.pod:1
+#: ../common/mlcustomize/customize-options.pod:25 ../docs/guestfs-recipes.pod:1
+#: ../docs/guestfs-recipes.pod:6 ../docs/guestfs-release-notes.pod:5
+#: ../docs/guestfs-release-notes.pod:9 ../docs/guestfs-release-notes.pod:11
+#: ../docs/guestfs-release-notes.pod:18 ../docs/guestfs-release-notes.pod:221
+#: ../docs/guestfs-release-notes.pod:225 ../docs/guestfs-release-notes.pod:753
+#: ../docs/guestfs-release-notes.pod:757 ../docs/guestfs-release-notes.pod:1362
 #: ../docs/guestfs-release-notes.pod:1366
 #: ../docs/guestfs-release-notes.pod:2002
 #: ../docs/guestfs-release-notes.pod:2006
@@ -8492,7 +8493,7 @@ msgid "comment"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:3
+#: ../common/mlcustomize/customize-options.pod:3
 #, no-wrap
 msgid ""
 "libguestfs generated file\n"
@@ -8504,10 +8505,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:9 ../fish/guestfish-actions.pod:9
-#: ../fish/guestfish-commands.pod:9 ../fish/guestfish-prepopts.pod:9
-#: ../lib/guestfs-actions.pod:9 ../lib/guestfs-availability.pod:9
-#: ../lib/guestfs-structs.pod:9
+#: ../common/mlcustomize/customize-options.pod:9
+#: ../fish/guestfish-actions.pod:9 ../fish/guestfish-commands.pod:9
+#: ../fish/guestfish-prepopts.pod:9 ../lib/guestfs-actions.pod:9
+#: ../lib/guestfs-availability.pod:9 ../lib/guestfs-structs.pod:9
 #, no-wrap
 msgid ""
 " Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -8515,10 +8516,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:11 ../fish/guestfish-actions.pod:11
-#: ../fish/guestfish-commands.pod:11 ../fish/guestfish-prepopts.pod:11
-#: ../lib/guestfs-actions.pod:11 ../lib/guestfs-availability.pod:11
-#: ../lib/guestfs-structs.pod:11
+#: ../common/mlcustomize/customize-options.pod:11
+#: ../fish/guestfish-actions.pod:11 ../fish/guestfish-commands.pod:11
+#: ../fish/guestfish-prepopts.pod:11 ../lib/guestfs-actions.pod:11
+#: ../lib/guestfs-availability.pod:11 ../lib/guestfs-structs.pod:11
 #, no-wrap
 msgid ""
 " This program is free software; you can redistribute it and/or modify\n"
@@ -8529,10 +8530,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:16 ../fish/guestfish-actions.pod:16
-#: ../fish/guestfish-commands.pod:16 ../fish/guestfish-prepopts.pod:16
-#: ../lib/guestfs-actions.pod:16 ../lib/guestfs-availability.pod:16
-#: ../lib/guestfs-structs.pod:16
+#: ../common/mlcustomize/customize-options.pod:16
+#: ../fish/guestfish-actions.pod:16 ../fish/guestfish-commands.pod:16
+#: ../fish/guestfish-prepopts.pod:16 ../lib/guestfs-actions.pod:16
+#: ../lib/guestfs-availability.pod:16 ../lib/guestfs-structs.pod:16
 #, no-wrap
 msgid ""
 " This program is distributed in the hope that it will be useful,\n"
@@ -8543,10 +8544,10 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:21 ../fish/guestfish-actions.pod:21
-#: ../fish/guestfish-commands.pod:21 ../fish/guestfish-prepopts.pod:21
-#: ../lib/guestfs-actions.pod:21 ../lib/guestfs-availability.pod:21
-#: ../lib/guestfs-structs.pod:21
+#: ../common/mlcustomize/customize-options.pod:21
+#: ../fish/guestfish-actions.pod:21 ../fish/guestfish-commands.pod:21
+#: ../fish/guestfish-prepopts.pod:21 ../lib/guestfs-actions.pod:21
+#: ../lib/guestfs-availability.pod:21 ../lib/guestfs-structs.pod:21
 #, no-wrap
 msgid ""
 " You should have received a copy of the GNU General Public License along\n"
@@ -8556,12 +8557,13 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:29
+#: ../common/mlcustomize/customize-options.pod:29
 msgid "B<--append-line> FILE:LINE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:31 ../sysprep/sysprep-extra-options.pod:4
+#: ../common/mlcustomize/customize-options.pod:31
+#: ../sysprep/sysprep-extra-options.pod:4
 msgid ""
 "Append a single line of text to the C<FILE>.  If the file does not already "
 "end with a newline, then one is added before the appended line.  Also a "
@@ -8569,12 +8571,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:36 ../sysprep/sysprep-extra-options.pod:9
+#: ../common/mlcustomize/customize-options.pod:36
+#: ../sysprep/sysprep-extra-options.pod:9
 msgid "For example (assuming ordinary shell quoting) this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:38
+#: ../common/mlcustomize/customize-options.pod:38
 #: ../sysprep/sysprep-extra-options.pod:11
 #, no-wrap
 msgid ""
@@ -8583,7 +8586,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:40
+#: ../common/mlcustomize/customize-options.pod:40
 #: ../sysprep/sysprep-extra-options.pod:13
 msgid ""
 "will add either C<10.0.0.1 foo⏎> or C<⏎10.0.0.1 foo⏎> to the file, the "
@@ -8591,7 +8594,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:44
+#: ../common/mlcustomize/customize-options.pod:44
 #: ../sysprep/sysprep-extra-options.pod:17
 msgid ""
 "C<⏎> represents a newline character, which is guessed by looking at the "
@@ -8601,13 +8604,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:49
+#: ../common/mlcustomize/customize-options.pod:49
 #: ../sysprep/sysprep-extra-options.pod:22
 msgid "To insert several lines, use the same option several times:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:51
+#: ../common/mlcustomize/customize-options.pod:51
 #: ../sysprep/sysprep-extra-options.pod:24
 #, no-wrap
 msgid ""
@@ -8617,13 +8620,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:54
+#: ../common/mlcustomize/customize-options.pod:54
 #: ../sysprep/sysprep-extra-options.pod:27
 msgid "To insert a blank line before the appended line, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:56
+#: ../common/mlcustomize/customize-options.pod:56
 #: ../sysprep/sysprep-extra-options.pod:29
 #, no-wrap
 msgid ""
@@ -8633,18 +8636,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:59
+#: ../common/mlcustomize/customize-options.pod:59
 msgid "B<--chmod> PERMISSIONS:FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:61
+#: ../common/mlcustomize/customize-options.pod:61
 #: ../sysprep/sysprep-extra-options.pod:35
 msgid "Change the permissions of C<FILE> to C<PERMISSIONS>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:63
+#: ../common/mlcustomize/customize-options.pod:63
 #: ../sysprep/sysprep-extra-options.pod:37
 msgid ""
 "I<Note>: C<PERMISSIONS> by default would be decimal, unless you prefix it "
@@ -8652,19 +8655,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:66
+#: ../common/mlcustomize/customize-options.pod:66
 msgid "B<--commands-from-file> FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:68
+#: ../common/mlcustomize/customize-options.pod:68
 #: ../sysprep/sysprep-extra-options.pod:43
 msgid ""
 "Read the customize commands from a file, one (and its arguments)  each line."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:71
+#: ../common/mlcustomize/customize-options.pod:71
 #: ../sysprep/sysprep-extra-options.pod:46
 msgid ""
 "Each line contains a single customization command and its arguments, for "
@@ -8672,7 +8675,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:74
+#: ../common/mlcustomize/customize-options.pod:74
 #: ../sysprep/sysprep-extra-options.pod:49
 #, no-wrap
 msgid ""
@@ -8683,7 +8686,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:78
+#: ../common/mlcustomize/customize-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:53
 msgid ""
 "Empty lines are ignored, and lines starting with C<#> are comments and are "
@@ -8693,7 +8696,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:83
+#: ../common/mlcustomize/customize-options.pod:83
 #: ../sysprep/sysprep-extra-options.pod:58
 #, no-wrap
 msgid ""
@@ -8703,7 +8706,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:86
+#: ../common/mlcustomize/customize-options.pod:86
 #: ../sysprep/sysprep-extra-options.pod:61
 msgid ""
 "The commands are handled in the same order as they are in the file, as if "
@@ -8711,32 +8714,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:90
+#: ../common/mlcustomize/customize-options.pod:90
 msgid "B<--copy> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:92
+#: ../common/mlcustomize/customize-options.pod:92
 #: ../sysprep/sysprep-extra-options.pod:68
 msgid "Copy files or directories recursively inside the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:94 ../customize/customize-options.pod:101
-#: ../customize/customize-options.pod:199 ../lib/guestfs-actions.pod:3267
-#: ../lib/guestfs-actions.pod:3288 ../sysprep/sysprep-extra-options.pod:70
+#: ../common/mlcustomize/customize-options.pod:94
+#: ../common/mlcustomize/customize-options.pod:101
+#: ../common/mlcustomize/customize-options.pod:199
+#: ../lib/guestfs-actions.pod:3267 ../lib/guestfs-actions.pod:3288
+#: ../sysprep/sysprep-extra-options.pod:70
 #: ../sysprep/sysprep-extra-options.pod:78
 #: ../sysprep/sysprep-extra-options.pod:200
 msgid "Wildcards cannot be used."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:96
+#: ../common/mlcustomize/customize-options.pod:96
 msgid "B<--copy-in> LOCALPATH:REMOTEDIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:98
+#: ../common/mlcustomize/customize-options.pod:98
 #: ../sysprep/sysprep-extra-options.pod:75
 msgid ""
 "Copy local files or directories recursively into the disk image, placing "
@@ -8744,12 +8749,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:103
+#: ../common/mlcustomize/customize-options.pod:103
 msgid "B<--delete> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:105
+#: ../common/mlcustomize/customize-options.pod:105
 #: ../sysprep/sysprep-extra-options.pod:83
 msgid ""
 "Delete a file from the guest.  Or delete a directory (and all its contents, "
@@ -8757,7 +8762,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:108
+#: ../common/mlcustomize/customize-options.pod:108
 #: ../sysprep/sysprep-extra-options.pod:86
 msgid ""
 "You can use shell glob characters in the specified path.  Be careful to "
@@ -8766,7 +8771,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../customize/customize-options.pod:112
+#: ../common/mlcustomize/customize-options.pod:112
 #: ../sysprep/sysprep-extra-options.pod:90
 #, no-wrap
 msgid ""
@@ -8775,24 +8780,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:114
+#: ../common/mlcustomize/customize-options.pod:114
 #: ../sysprep/sysprep-extra-options.pod:92
 msgid "See also: I<--upload>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:116
+#: ../common/mlcustomize/customize-options.pod:116
 msgid "B<--edit> FILE:EXPR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:118
+#: ../common/mlcustomize/customize-options.pod:118
 #: ../sysprep/sysprep-extra-options.pod:97
 msgid "Edit C<FILE> using the Perl expression C<EXPR>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:120 ../edit/virt-edit.pod:127
+#: ../common/mlcustomize/customize-options.pod:120 ../edit/virt-edit.pod:127
 #: ../sysprep/sysprep-extra-options.pod:99
 msgid ""
 "Be careful to properly quote the expression to prevent it from being altered "
@@ -8800,24 +8805,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:123 ../edit/virt-edit.pod:130
+#: ../common/mlcustomize/customize-options.pod:123 ../edit/virt-edit.pod:130
 #: ../sysprep/sysprep-extra-options.pod:102
 msgid "Note that this option is only available when Perl 5 is installed."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:125
+#: ../common/mlcustomize/customize-options.pod:125
 #: ../sysprep/sysprep-extra-options.pod:104
 msgid "See L<virt-edit(1)/NON-INTERACTIVE EDITING>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:127
+#: ../common/mlcustomize/customize-options.pod:127
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:129
+#: ../common/mlcustomize/customize-options.pod:129
 #: ../sysprep/sysprep-extra-options.pod:109
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
@@ -8825,13 +8830,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:132
+#: ../common/mlcustomize/customize-options.pod:132
 #: ../sysprep/sysprep-extra-options.pod:112
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:134
+#: ../common/mlcustomize/customize-options.pod:134
 #: ../sysprep/sysprep-extra-options.pod:114
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
@@ -8839,8 +8844,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:137
-#: ../customize/customize-options.pod:150
+#: ../common/mlcustomize/customize-options.pod:137
+#: ../common/mlcustomize/customize-options.pod:150
 #: ../sysprep/sysprep-extra-options.pod:117
 #: ../sysprep/sysprep-extra-options.pod:131
 msgid ""
@@ -8849,8 +8854,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:140
-#: ../customize/customize-options.pod:153
+#: ../common/mlcustomize/customize-options.pod:140
+#: ../common/mlcustomize/customize-options.pod:153
 #: ../sysprep/sysprep-extra-options.pod:120
 #: ../sysprep/sysprep-extra-options.pod:134
 msgid ""
@@ -8859,20 +8864,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:143
-#: ../customize/customize-options.pod:156
+#: ../common/mlcustomize/customize-options.pod:143
+#: ../common/mlcustomize/customize-options.pod:156
 #: ../sysprep/sysprep-extra-options.pod:123
 #: ../sysprep/sysprep-extra-options.pod:137
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:145
+#: ../common/mlcustomize/customize-options.pod:145
 msgid "B<--firstboot-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:147
+#: ../common/mlcustomize/customize-options.pod:147
 #: ../sysprep/sysprep-extra-options.pod:128
 msgid ""
 "Run command (and arguments) inside the guest when the guest first boots up "
@@ -8880,12 +8885,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:158
+#: ../common/mlcustomize/customize-options.pod:158
 msgid "B<--firstboot-install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:160
+#: ../common/mlcustomize/customize-options.pod:160
 #: ../sysprep/sysprep-extra-options.pod:142
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8894,8 +8899,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:164
-#: ../customize/customize-options.pod:178
+#: ../common/mlcustomize/customize-options.pod:164
+#: ../common/mlcustomize/customize-options.pod:178
 #: ../sysprep/sysprep-extra-options.pod:146
 #: ../sysprep/sysprep-extra-options.pod:162
 msgid ""
@@ -8904,12 +8909,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:167
+#: ../common/mlcustomize/customize-options.pod:167
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:169
+#: ../common/mlcustomize/customize-options.pod:169
 #: ../sysprep/sysprep-extra-options.pod:152
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
@@ -8917,12 +8922,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:172
+#: ../common/mlcustomize/customize-options.pod:172
 msgid "B<--install> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:174
+#: ../common/mlcustomize/customize-options.pod:174
 #: ../sysprep/sysprep-extra-options.pod:158
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
@@ -8931,18 +8936,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:181
+#: ../common/mlcustomize/customize-options.pod:181
 #: ../sysprep/sysprep-extra-options.pod:165
 msgid "See also I<--update>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:183
+#: ../common/mlcustomize/customize-options.pod:183
 msgid "B<--link> TARGET:LINK[:LINK..]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:185
+#: ../common/mlcustomize/customize-options.pod:185
 #: ../sysprep/sysprep-extra-options.pod:184
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
@@ -8950,18 +8955,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:188
+#: ../common/mlcustomize/customize-options.pod:188
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:190
+#: ../common/mlcustomize/customize-options.pod:190
 #: ../sysprep/sysprep-extra-options.pod:190
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:192
+#: ../common/mlcustomize/customize-options.pod:192
 #: ../sysprep/sysprep-extra-options.pod:192
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
@@ -8969,23 +8974,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:195
+#: ../common/mlcustomize/customize-options.pod:195
 msgid "B<--move> SOURCE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:197
+#: ../common/mlcustomize/customize-options.pod:197
 #: ../sysprep/sysprep-extra-options.pod:198
 msgid "Move files or directories inside the guest."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:201
+#: ../common/mlcustomize/customize-options.pod:201
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:203
+#: ../common/mlcustomize/customize-options.pod:203
 #: ../sysprep/sysprep-extra-options.pod:205
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
@@ -8994,18 +8999,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:207
+#: ../common/mlcustomize/customize-options.pod:207
 #: ../sysprep/sysprep-extra-options.pod:209
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:209
+#: ../common/mlcustomize/customize-options.pod:209
 msgid "B<--password> USER:SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:211
+#: ../common/mlcustomize/customize-options.pod:211
 #: ../sysprep/sysprep-extra-options.pod:214
 msgid ""
 "Set the password for C<USER>.  (Note this option does I<not> create the user "
@@ -9013,8 +9018,8 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:214
-#: ../customize/customize-options.pod:243
+#: ../common/mlcustomize/customize-options.pod:214
+#: ../common/mlcustomize/customize-options.pod:243
 #: ../sysprep/sysprep-extra-options.pod:217
 #: ../sysprep/sysprep-extra-options.pod:262
 msgid ""
@@ -9023,12 +9028,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:217
+#: ../common/mlcustomize/customize-options.pod:217
 msgid "B<--password-crypto> md5|sha256|sha512"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:219
+#: ../common/mlcustomize/customize-options.pod:219
 #: ../sysprep/sysprep-extra-options.pod:223
 msgid ""
 "When the virt tools change or set a password in the guest, this option sets "
@@ -9036,7 +9041,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:223
+#: ../common/mlcustomize/customize-options.pod:223
 #: ../sysprep/sysprep-extra-options.pod:227
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
@@ -9044,7 +9049,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:226
+#: ../common/mlcustomize/customize-options.pod:226
 #: ../sysprep/sysprep-extra-options.pod:230
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
@@ -9052,7 +9057,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:229
+#: ../common/mlcustomize/customize-options.pod:229
 #: ../sysprep/sysprep-extra-options.pod:233
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
@@ -9061,7 +9066,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:233
+#: ../common/mlcustomize/customize-options.pod:233
 #: ../sysprep/sysprep-extra-options.pod:237
 msgid ""
 "Note this does not change the default password encryption used by the guest "
@@ -9071,18 +9076,18 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:239
+#: ../common/mlcustomize/customize-options.pod:239
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:241
+#: ../common/mlcustomize/customize-options.pod:241
 #: ../sysprep/sysprep-extra-options.pod:260
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:246
+#: ../common/mlcustomize/customize-options.pod:246
 #: ../sysprep/sysprep-extra-options.pod:265
 msgid ""
 "Note: In virt-builder, if you I<don't> set I<--root-password> then the guest "
@@ -9090,12 +9095,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:249
+#: ../common/mlcustomize/customize-options.pod:249
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:251
+#: ../common/mlcustomize/customize-options.pod:251
 #: ../sysprep/sysprep-extra-options.pod:271
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
@@ -9104,14 +9109,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:255
+#: ../common/mlcustomize/customize-options.pod:255
 #: ../sysprep/sysprep-extra-options.pod:275
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:257
-#: ../customize/customize-options.pod:273
+#: ../common/mlcustomize/customize-options.pod:257
+#: ../common/mlcustomize/customize-options.pod:273
 #: ../sysprep/sysprep-extra-options.pod:277
 #: ../sysprep/sysprep-extra-options.pod:294
 msgid ""
@@ -9123,7 +9128,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:263
+#: ../common/mlcustomize/customize-options.pod:263
 #: ../sysprep/sysprep-extra-options.pod:283
 msgid ""
 "You can have multiple I<--run> options.  They run in the same order that "
@@ -9131,20 +9136,20 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:266
-#: ../customize/customize-options.pod:282
+#: ../common/mlcustomize/customize-options.pod:266
+#: ../common/mlcustomize/customize-options.pod:282
 #: ../sysprep/sysprep-extra-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:303
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:268
+#: ../common/mlcustomize/customize-options.pod:268
 msgid "B<--run-command> 'CMD+ARGS'"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:270
+#: ../common/mlcustomize/customize-options.pod:270
 #: ../sysprep/sysprep-extra-options.pod:291
 msgid ""
 "Run the command and arguments on the disk image.  The command runs "
@@ -9152,7 +9157,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:279
+#: ../common/mlcustomize/customize-options.pod:279
 #: ../sysprep/sysprep-extra-options.pod:300
 msgid ""
 "You can have multiple I<--run-command> options.  They run in the same order "
@@ -9160,41 +9165,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:284
+#: ../common/mlcustomize/customize-options.pod:284
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:286
+#: ../common/mlcustomize/customize-options.pod:286
 #: ../sysprep/sysprep-extra-options.pod:330
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:292
+#: ../common/mlcustomize/customize-options.pod:292
 #: ../sysprep/sysprep-extra-options.pod:336
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:296
+#: ../common/mlcustomize/customize-options.pod:296
 #: ../sysprep/sysprep-extra-options.pod:340
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:300
+#: ../common/mlcustomize/customize-options.pod:300
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:302
+#: ../common/mlcustomize/customize-options.pod:302
 #: ../sysprep/sysprep-extra-options.pod:347
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:304
+#: ../common/mlcustomize/customize-options.pod:304
 #: ../sysprep/sysprep-extra-options.pod:349
 msgid ""
 "This will attempt to relabel files immediately, but if the operation fails "
@@ -9203,25 +9208,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:308
+#: ../common/mlcustomize/customize-options.pod:308
 #: ../sysprep/sysprep-extra-options.pod:353
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:310
+#: ../common/mlcustomize/customize-options.pod:310
 msgid "B<--sm-attach> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:312
+#: ../common/mlcustomize/customize-options.pod:312
 #: ../sysprep/sysprep-extra-options.pod:358
 msgid "Attach to a pool using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:314
-#: ../customize/customize-options.pod:321
+#: ../common/mlcustomize/customize-options.pod:314
+#: ../common/mlcustomize/customize-options.pod:321
 #: ../sysprep/sysprep-extra-options.pod:360
 #: ../sysprep/sysprep-extra-options.pod:368
 msgid ""
@@ -9230,63 +9235,63 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:317
+#: ../common/mlcustomize/customize-options.pod:317
 msgid "B<--sm-credentials> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:319
+#: ../common/mlcustomize/customize-options.pod:319
 #: ../sysprep/sysprep-extra-options.pod:366
 msgid "Set the credentials for C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:324
+#: ../common/mlcustomize/customize-options.pod:324
 msgid "B<--sm-register>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:326
+#: ../common/mlcustomize/customize-options.pod:326
 #: ../sysprep/sysprep-extra-options.pod:374
 msgid "Register the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:328
+#: ../common/mlcustomize/customize-options.pod:328
 #: ../sysprep/sysprep-extra-options.pod:376
 msgid "This requires credentials being set using I<--sm-credentials>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:330
+#: ../common/mlcustomize/customize-options.pod:330
 msgid "B<--sm-remove>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:332
+#: ../common/mlcustomize/customize-options.pod:332
 #: ../sysprep/sysprep-extra-options.pod:381
 msgid ""
 "Remove all the subscriptions from the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:335
+#: ../common/mlcustomize/customize-options.pod:335
 msgid "B<--sm-unregister>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:337
+#: ../common/mlcustomize/customize-options.pod:337
 #: ../sysprep/sysprep-extra-options.pod:387
 msgid "Unregister the guest using C<subscription-manager>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:339
+#: ../common/mlcustomize/customize-options.pod:339
 msgid "B<--ssh-inject> USER[:SELECTOR]"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:341
+#: ../common/mlcustomize/customize-options.pod:341
 #: ../sysprep/sysprep-extra-options.pod:392
 msgid ""
 "Inject an ssh key so the given C<USER> will be able to log in over ssh "
@@ -9294,14 +9299,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:345
+#: ../common/mlcustomize/customize-options.pod:345
 #: ../sysprep/sysprep-extra-options.pod:396
 msgid ""
 "See L<virt-builder(1)/SSH KEYS> for the format of the C<SELECTOR> field."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:348
+#: ../common/mlcustomize/customize-options.pod:348
 #: ../sysprep/sysprep-extra-options.pod:399
 msgid ""
 "You can have multiple I<--ssh-inject> options, for different users and also "
@@ -9309,12 +9314,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:351
+#: ../common/mlcustomize/customize-options.pod:351
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:353
+#: ../common/mlcustomize/customize-options.pod:353
 #: ../sysprep/sysprep-extra-options.pod:405
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
@@ -9322,23 +9327,23 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:356
+#: ../common/mlcustomize/customize-options.pod:356
 msgid "B<--touch> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:358
+#: ../common/mlcustomize/customize-options.pod:358
 #: ../sysprep/sysprep-extra-options.pod:411
 msgid "This command performs a L<touch(1)>-like operation on C<FILE>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:360
+#: ../common/mlcustomize/customize-options.pod:360
 msgid "B<--truncate> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:362
+#: ../common/mlcustomize/customize-options.pod:362
 #: ../sysprep/sysprep-extra-options.pod:416
 msgid ""
 "This command truncates C<FILE> to a zero-length file. The file must exist "
@@ -9346,24 +9351,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:365
+#: ../common/mlcustomize/customize-options.pod:365
 msgid "B<--truncate-recursive> PATH"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:367
+#: ../common/mlcustomize/customize-options.pod:367
 #: ../sysprep/sysprep-extra-options.pod:422
 msgid ""
 "This command recursively truncates all files under C<PATH> to zero-length."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:369
+#: ../common/mlcustomize/customize-options.pod:369
 msgid "B<--uninstall> PKG,PKG.."
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:371
+#: ../common/mlcustomize/customize-options.pod:371
 #: ../sysprep/sysprep-extra-options.pod:427
 msgid ""
 "Uninstall the named packages (a comma-separated list).  These are removed "
@@ -9373,18 +9378,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:376
+#: ../common/mlcustomize/customize-options.pod:376
 #: ../sysprep/sysprep-extra-options.pod:432
 msgid "See also I<--install>, I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:378
+#: ../common/mlcustomize/customize-options.pod:378
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:380
+#: ../common/mlcustomize/customize-options.pod:380
 #: ../sysprep/sysprep-extra-options.pod:437
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
@@ -9393,18 +9398,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:384
+#: ../common/mlcustomize/customize-options.pod:384
 #: ../sysprep/sysprep-extra-options.pod:441
 msgid "See also I<--install>, I<--uninstall>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:386
+#: ../common/mlcustomize/customize-options.pod:386
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:388
+#: ../common/mlcustomize/customize-options.pod:388
 #: ../sysprep/sysprep-extra-options.pod:446
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
@@ -9413,7 +9418,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:392
+#: ../common/mlcustomize/customize-options.pod:392
 #: ../sysprep/sysprep-extra-options.pod:450
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
@@ -9421,7 +9426,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:395
+#: ../common/mlcustomize/customize-options.pod:395
 #: ../sysprep/sysprep-extra-options.pod:453
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
@@ -9430,18 +9435,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:399
+#: ../common/mlcustomize/customize-options.pod:399
 #: ../sysprep/sysprep-extra-options.pod:457
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: =item
-#: ../customize/customize-options.pod:401
+#: ../common/mlcustomize/customize-options.pod:401
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../customize/customize-options.pod:403
+#: ../common/mlcustomize/customize-options.pod:403
 #: ../sysprep/sysprep-extra-options.pod:462
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
@@ -12753,7 +12758,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:496
+#: ../docs/guestfs-building.pod:514 ../docs/guestfs-hacking.pod:505
 #: ../docs/guestfs-testing.pod:76 ../docs/guestfs-testing.pod:138
 #: ../docs/guestfs-testing.pod:245 ../docs/guestfs-testing.pod:258
 #: ../docs/guestfs-testing.pod:322 ../fish/guestfish.pod:1072
@@ -16408,284 +16413,305 @@ msgstr ""
 
 #. type: =item
 #: ../docs/guestfs-hacking.pod:102
-msgid "F<common/mlgettext>"
+msgid "F<common/mlcustomize>"
 msgstr ""
 
 #. type: textblock
 #: ../docs/guestfs-hacking.pod:104
 msgid ""
+"Library code associated with C<virt-customize> but also used in other tools."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:107
+msgid "F<common/mlgettext>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:109
+msgid ""
 "Small, generated wrapper which allows libguestfs to be compiled with or "
 "without ocaml-gettext.  This is generated by F<./configure>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:107
+#: ../docs/guestfs-hacking.pod:112
 msgid "F<common/mlpcre>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:109
+#: ../docs/guestfs-hacking.pod:114
 msgid ""
 "Lightweight OCaml bindings for Perl Compatible Regular Expressions (PCRE).  "
 "Note this is not related in any way to Markus Mottl's ocaml-pcre library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:113
+#: ../docs/guestfs-hacking.pod:118
 msgid "F<common/mlprogress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:115
+#: ../docs/guestfs-hacking.pod:120
 msgid "OCaml bindings for the progress bar functions (see F<common/progress>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:117
+#: ../docs/guestfs-hacking.pod:122
 msgid "F<common/mlstdutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:119
+#: ../docs/guestfs-hacking.pod:124
 msgid "A library of pure OCaml utility functions used in many places."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:121
+#: ../docs/guestfs-hacking.pod:126
 msgid "F<common/mltools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:123
+#: ../docs/guestfs-hacking.pod:128
 msgid ""
 "OCaml utility functions only used by the OCaml virt tools (like C<virt-"
 "sysprep>, C<virt-v2v> etc.)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:126
+#: ../docs/guestfs-hacking.pod:131
 msgid "F<common/mlutils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:128
+#: ../docs/guestfs-hacking.pod:133
 msgid ""
 "OCaml bindings for C functions in C<common/utils>, and some POSIX bindings "
 "which are missing from the OCaml stdlib."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:131
+#: ../docs/guestfs-hacking.pod:136
+msgid "F<common/mlv2v>"
+msgstr ""
+
+#. type: textblock
+#: ../docs/guestfs-hacking.pod:138
+msgid "A few generated files used by virt-v2v."
+msgstr ""
+
+#. type: =item
+#: ../docs/guestfs-hacking.pod:140
 msgid "F<common/mlvisit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:133
+#: ../docs/guestfs-hacking.pod:142
 msgid "OCaml bindings for the visit functions (see F<common/visit>)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:135
+#: ../docs/guestfs-hacking.pod:144
 msgid "F<common/mlxml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:137
+#: ../docs/guestfs-hacking.pod:146
 msgid "OCaml bindings for the libxml2 library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:139
+#: ../docs/guestfs-hacking.pod:148
 msgid "F<common/options>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:141
+#: ../docs/guestfs-hacking.pod:150
 msgid "Common options parsing for guestfish, guestmount and some virt tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:143
+#: ../docs/guestfs-hacking.pod:152
 msgid "F<common/parallel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:145
+#: ../docs/guestfs-hacking.pod:154
 msgid "A framework used for processing multiple libvirt domains in parallel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:147
+#: ../docs/guestfs-hacking.pod:156
 msgid "F<common/progress>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:149
+#: ../docs/guestfs-hacking.pod:158
 msgid "Common code for printing progress bars."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:151
+#: ../docs/guestfs-hacking.pod:160
 msgid "F<common/protocol>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:153
+#: ../docs/guestfs-hacking.pod:162
 msgid ""
 "The XDR-based communication protocol used between the library and the daemon "
 "running inside the appliance is defined here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:156
+#: ../docs/guestfs-hacking.pod:165
 msgid "F<common/qemuopts>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:158 ../docs/internal-documentation.pod:2537
+#: ../docs/guestfs-hacking.pod:167 ../docs/internal-documentation.pod:2537
 msgid "Mini-library for writing qemu command lines and qemu config files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:160
+#: ../docs/guestfs-hacking.pod:169
 msgid "F<common/structs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:162
+#: ../docs/guestfs-hacking.pod:171
 msgid ""
 "Common code for printing and freeing libguestfs structs, used by the library "
 "and some tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:165
+#: ../docs/guestfs-hacking.pod:174
 msgid "F<common/utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:167
+#: ../docs/guestfs-hacking.pod:176
 msgid "Various utility functions used throughout the library and tools."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:169
+#: ../docs/guestfs-hacking.pod:178
 msgid "F<common/visit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:171
+#: ../docs/guestfs-hacking.pod:180
 msgid "Recursively visit a guestfs filesystem hierarchy."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:173
+#: ../docs/guestfs-hacking.pod:182
 msgid "F<common/windows>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:175
+#: ../docs/guestfs-hacking.pod:184
 msgid "Utility functions for handling Windows drive letters."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:179
+#: ../docs/guestfs-hacking.pod:188
 msgid "F<contrib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:181
+#: ../docs/guestfs-hacking.pod:190
 msgid "Outside contributions, experimental parts."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:183
+#: ../docs/guestfs-hacking.pod:192
 msgid "F<customize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:185
+#: ../docs/guestfs-hacking.pod:194
 msgid "L<virt-customize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:187
+#: ../docs/guestfs-hacking.pod:196
 msgid "F<daemon>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:189
+#: ../docs/guestfs-hacking.pod:198
 msgid ""
 "The daemon that runs inside the libguestfs appliance and carries out actions."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:192
+#: ../docs/guestfs-hacking.pod:201
 msgid "F<df>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:194
+#: ../docs/guestfs-hacking.pod:203
 msgid "L<virt-df(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:196
+#: ../docs/guestfs-hacking.pod:205
 msgid "F<dib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:198
+#: ../docs/guestfs-hacking.pod:207
 msgid "L<virt-dib(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:200
+#: ../docs/guestfs-hacking.pod:209
 msgid "F<diff>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:202
+#: ../docs/guestfs-hacking.pod:211
 msgid "L<virt-diff(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:204
+#: ../docs/guestfs-hacking.pod:213
 msgid "F<docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:206
+#: ../docs/guestfs-hacking.pod:215
 msgid "Miscellaneous manual pages."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:208
+#: ../docs/guestfs-hacking.pod:217
 msgid "F<edit>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:210
+#: ../docs/guestfs-hacking.pod:219
 msgid "L<virt-edit(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:212
+#: ../docs/guestfs-hacking.pod:221
 msgid "F<examples>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:214
+#: ../docs/guestfs-hacking.pod:223
 msgid "C API example code."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:216
+#: ../docs/guestfs-hacking.pod:225
 msgid "F<fish>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:218
+#: ../docs/guestfs-hacking.pod:227
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
 "top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
@@ -16693,127 +16719,127 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:222
+#: ../docs/guestfs-hacking.pod:231
 msgid "F<format>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:224
+#: ../docs/guestfs-hacking.pod:233
 msgid "L<virt-format(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:226
+#: ../docs/guestfs-hacking.pod:235
 msgid "F<fuse>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:228
+#: ../docs/guestfs-hacking.pod:237
 msgid ""
 "L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:230
+#: ../docs/guestfs-hacking.pod:239
 msgid "F<generator>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:232
+#: ../docs/guestfs-hacking.pod:241
 msgid ""
 "The crucially important generator, used to automatically generate large "
 "amounts of boilerplate C code for things like RPC and bindings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:235
+#: ../docs/guestfs-hacking.pod:244
 msgid "F<get-kernel>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:237
+#: ../docs/guestfs-hacking.pod:246
 msgid "L<virt-get-kernel(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:239
+#: ../docs/guestfs-hacking.pod:248
 msgid "F<gnulib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:241
+#: ../docs/guestfs-hacking.pod:250
 msgid ""
 "Gnulib is used as a portability library.  A copy of gnulib is included under "
 "here."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:244
+#: ../docs/guestfs-hacking.pod:253
 msgid "F<inspector>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:246
+#: ../docs/guestfs-hacking.pod:255
 msgid "L<virt-inspector(1)>, the virtual machine image inspector."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:248
+#: ../docs/guestfs-hacking.pod:257
 msgid "F<lib>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:250
+#: ../docs/guestfs-hacking.pod:259
 msgid "Source code to the C library."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:252
+#: ../docs/guestfs-hacking.pod:261
 msgid "F<logo>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:254
+#: ../docs/guestfs-hacking.pod:263
 msgid "Logo used on the website.  The fish is called Arthur by the way."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:256
+#: ../docs/guestfs-hacking.pod:265
 msgid "F<m4>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:258
+#: ../docs/guestfs-hacking.pod:267
 msgid "M4 macros used by autoconf.  See L</THE BUILD SYSTEM>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:260
+#: ../docs/guestfs-hacking.pod:269
 msgid "F<make-fs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:262
+#: ../docs/guestfs-hacking.pod:271
 msgid "L<virt-make-fs(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:264
+#: ../docs/guestfs-hacking.pod:273
 msgid "F<po>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:266
+#: ../docs/guestfs-hacking.pod:275
 msgid "Translations of simple gettext strings."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:268
+#: ../docs/guestfs-hacking.pod:277
 msgid "F<po-docs>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:270
+#: ../docs/guestfs-hacking.pod:279
 msgid ""
 "The build infrastructure and PO files for translations of manpages and POD "
 "files.  Eventually this will be combined with the F<po> directory, but that "
@@ -16821,84 +16847,84 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:274
+#: ../docs/guestfs-hacking.pod:283
 msgid "F<rescue>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:276
+#: ../docs/guestfs-hacking.pod:285
 msgid "L<virt-rescue(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:278
+#: ../docs/guestfs-hacking.pod:287
 msgid "F<resize>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:280
+#: ../docs/guestfs-hacking.pod:289
 msgid "L<virt-resize(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:282
+#: ../docs/guestfs-hacking.pod:291
 msgid "F<sparsify>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:284
+#: ../docs/guestfs-hacking.pod:293
 msgid "L<virt-sparsify(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:286
+#: ../docs/guestfs-hacking.pod:295
 msgid "F<sysprep>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:288
+#: ../docs/guestfs-hacking.pod:297
 msgid "L<virt-sysprep(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:290
+#: ../docs/guestfs-hacking.pod:299
 msgid "F<tests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:292
+#: ../docs/guestfs-hacking.pod:301
 msgid "Tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:294
+#: ../docs/guestfs-hacking.pod:303
 msgid "F<test-data>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:296
+#: ../docs/guestfs-hacking.pod:305
 msgid "Files and other test data used by the tests."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:298
+#: ../docs/guestfs-hacking.pod:307
 msgid "F<test-tool>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:300
+#: ../docs/guestfs-hacking.pod:309
 msgid ""
 "Test tool for end users to test if their qemu/kernel combination will work "
 "with libguestfs."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:303
+#: ../docs/guestfs-hacking.pod:312
 msgid "F<tmp>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:305
+#: ../docs/guestfs-hacking.pod:314
 msgid ""
 "Used for temporary files when running the tests (instead of F</tmp> etc).  "
 "The reason is so that you can run multiple parallel tests of libguestfs "
@@ -16906,124 +16932,124 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:310
+#: ../docs/guestfs-hacking.pod:319
 msgid "F<tools>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:312
+#: ../docs/guestfs-hacking.pod:321
 msgid ""
 "Command line tools written in Perl (L<virt-win-reg(1)> and many others)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:314
+#: ../docs/guestfs-hacking.pod:323
 msgid "F<utils>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:316
+#: ../docs/guestfs-hacking.pod:325
 msgid "Miscellaneous utilities, such as C<boot-benchmark>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:318
+#: ../docs/guestfs-hacking.pod:327
 msgid "F<v2v>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:320
+#: ../docs/guestfs-hacking.pod:329
 msgid "L<virt-v2v(1)> command and documentation."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:322
+#: ../docs/guestfs-hacking.pod:331
 msgid "F<website>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:324
+#: ../docs/guestfs-hacking.pod:333
 msgid "The L<http://libguestfs.org> website files."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:326
+#: ../docs/guestfs-hacking.pod:335
 msgid "F<csharp>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:328
+#: ../docs/guestfs-hacking.pod:337
 msgid "F<erlang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:330
+#: ../docs/guestfs-hacking.pod:339
 msgid "F<gobject>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:332
+#: ../docs/guestfs-hacking.pod:341
 msgid "F<golang>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:334
+#: ../docs/guestfs-hacking.pod:343
 msgid "F<haskell>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:336
+#: ../docs/guestfs-hacking.pod:345
 msgid "F<java>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:338
+#: ../docs/guestfs-hacking.pod:347
 msgid "F<lua>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:340
+#: ../docs/guestfs-hacking.pod:349
 msgid "F<ocaml>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:342
+#: ../docs/guestfs-hacking.pod:351
 msgid "F<php>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:344
+#: ../docs/guestfs-hacking.pod:353
 msgid "F<perl>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:346
+#: ../docs/guestfs-hacking.pod:355
 msgid "F<python>"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:348
+#: ../docs/guestfs-hacking.pod:357
 msgid "F<ruby>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:350
+#: ../docs/guestfs-hacking.pod:359
 msgid "Language bindings."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:354
+#: ../docs/guestfs-hacking.pod:363
 msgid "THE BUILD SYSTEM"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:356
+#: ../docs/guestfs-hacking.pod:365
 msgid ""
 "Libguestfs uses the GNU autotools build system (autoconf, automake, libtool)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:359
+#: ../docs/guestfs-hacking.pod:368
 msgid ""
 "The F<./configure> script is generated from F<configure.ac> and F<m4/guestfs-"
 "*.m4>.  Most of the configure script is split over many m4 macro files by "
@@ -17032,14 +17058,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:364
+#: ../docs/guestfs-hacking.pod:373
 msgid ""
 "The job of the top level F<Makefile.am> is mainly to list the subdirectories "
 "(C<SUBDIRS>) in the order they should be compiled."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:367
+#: ../docs/guestfs-hacking.pod:376
 msgid ""
 "F<common-rules.mk> is included in every F<Makefile.am> (top level and "
 "subdirectories).  F<subdir-rules.mk> is included only in subdirectory "
@@ -17047,12 +17073,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:371
+#: ../docs/guestfs-hacking.pod:380
 msgid "There are many make targets.  Use this command to list them all:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:373
+#: ../docs/guestfs-hacking.pod:382
 #, no-wrap
 msgid ""
 " make help\n"
@@ -17060,29 +17086,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:375
+#: ../docs/guestfs-hacking.pod:384
 msgid "EXTENDING LIBGUESTFS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:377
+#: ../docs/guestfs-hacking.pod:386
 msgid "ADDING A NEW API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:379
+#: ../docs/guestfs-hacking.pod:388
 msgid ""
 "Because large amounts of boilerplate code in libguestfs are generated, this "
 "makes it easy to extend the libguestfs API."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:382
+#: ../docs/guestfs-hacking.pod:391
 msgid "To add a new API action there are two changes:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:388
+#: ../docs/guestfs-hacking.pod:397
 msgid ""
 "You need to add a description of the call (name, parameters, return type, "
 "tests, documentation) to F<generator/actions_*.ml> and possibly F<generator/"
@@ -17090,7 +17116,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:392
+#: ../docs/guestfs-hacking.pod:401
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
@@ -17102,7 +17128,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:400
+#: ../docs/guestfs-hacking.pod:409
 msgid ""
 "Most new actions are of the first type, and get added to the "
 "C<daemon_functions> list.  Each function has a unique procedure number used "
@@ -17112,7 +17138,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:406
+#: ../docs/guestfs-hacking.pod:415
 msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
@@ -17122,31 +17148,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:414
+#: ../docs/guestfs-hacking.pod:423
 msgid "Implement the action (in C):"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:416
+#: ../docs/guestfs-hacking.pod:425
 msgid ""
 "For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the "
 "C<daemon/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:419
+#: ../docs/guestfs-hacking.pod:428
 msgid ""
 "For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>> "
 "in the C<lib/> directory."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:422
+#: ../docs/guestfs-hacking.pod:431
 msgid "In either case, use another function as an example of what to do."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:426
+#: ../docs/guestfs-hacking.pod:435
 msgid ""
 "As an alternative to step 2: Since libguestfs 1.38, daemon actions can be "
 "implemented in OCaml.  You have to set the C<impl = OCaml ...> flag in the "
@@ -17154,12 +17180,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:433
+#: ../docs/guestfs-hacking.pod:442
 msgid "After making these changes, use C<make> to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:435
+#: ../docs/guestfs-hacking.pod:444
 msgid ""
 "Note that you don’t need to implement the RPC, language bindings, manual "
 "pages or anything else.  It’s all automatically generated from the OCaml "
@@ -17167,12 +17193,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:439
+#: ../docs/guestfs-hacking.pod:448
 msgid "Adding tests for an API"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:441
+#: ../docs/guestfs-hacking.pod:450
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
 "can either be added as part of the API description (F<generator/actions_*."
@@ -17182,61 +17208,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:447
+#: ../docs/guestfs-hacking.pod:456
 msgid ""
 "The following describes the test environment used when you add an API test "
 "in F<actions_*.ml>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:450
+#: ../docs/guestfs-hacking.pod:459
 msgid "The test environment has 4 block devices:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:454
+#: ../docs/guestfs-hacking.pod:463
 msgid "F</dev/sda> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:456
+#: ../docs/guestfs-hacking.pod:465
 msgid "General block device for testing."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:458
+#: ../docs/guestfs-hacking.pod:467
 msgid "F</dev/sdb> 2 GB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:460
+#: ../docs/guestfs-hacking.pod:469
 msgid ""
 "F</dev/sdb1> is an ext2 filesystem used for testing filesystem write "
 "operations."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:463
+#: ../docs/guestfs-hacking.pod:472
 msgid "F</dev/sdc> 10 MB"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:465
+#: ../docs/guestfs-hacking.pod:474
 msgid "Used in a few tests where two block devices are needed."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:467
+#: ../docs/guestfs-hacking.pod:476
 msgid "F</dev/sdd>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:469
+#: ../docs/guestfs-hacking.pod:478
 msgid "ISO with fixed content (see F<images/test.iso>)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:473
+#: ../docs/guestfs-hacking.pod:482
 msgid ""
 "To be able to run the tests in a reasonable amount of time, the libguestfs "
 "appliance and block devices are reused between tests.  So don't try testing "
@@ -17244,7 +17270,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:477
+#: ../docs/guestfs-hacking.pod:486
 msgid ""
 "Each test starts with an initial scenario, selected using one of the "
 "C<Init*> expressions, described in F<generator/types.ml>.  These initialize "
@@ -17254,7 +17280,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:483
+#: ../docs/guestfs-hacking.pod:492
 msgid ""
 "You can add a prerequisite clause to any individual test.  This is a run-"
 "time check, which, if it fails, causes the test to be skipped.  Useful if "
@@ -17264,14 +17290,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:489
+#: ../docs/guestfs-hacking.pod:498
 msgid ""
 "In addition, packagers can skip individual tests by setting environment "
 "variables before running C<make check>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:492
+#: ../docs/guestfs-hacking.pod:501
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>_<NUM>=1\n"
@@ -17279,13 +17305,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:494
+#: ../docs/guestfs-hacking.pod:503
 msgid ""
 "eg: C<SKIP_TEST_COMMAND_3=1> skips test #3 of L<guestfs(3)/guestfs_command>."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:498
+#: ../docs/guestfs-hacking.pod:507
 #, no-wrap
 msgid ""
 " SKIP_TEST_<CMD>=1\n"
@@ -17293,18 +17319,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:500
+#: ../docs/guestfs-hacking.pod:509
 msgid ""
 "eg: C<SKIP_TEST_ZEROFREE=1> skips all L<guestfs(3)/guestfs_zerofree> tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:502
+#: ../docs/guestfs-hacking.pod:511
 msgid "Packagers can run only certain tests by setting for example:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:504
+#: ../docs/guestfs-hacking.pod:513
 #, no-wrap
 msgid ""
 " TEST_ONLY=\"vfs_type zerofree\"\n"
@@ -17312,29 +17338,29 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:506
+#: ../docs/guestfs-hacking.pod:515
 msgid ""
 "See F<tests/c-api/tests.c> for more details of how these environment "
 "variables work."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:509
+#: ../docs/guestfs-hacking.pod:518
 msgid "Debugging new APIs"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:511
+#: ../docs/guestfs-hacking.pod:520
 msgid "Test new actions work before submitting them."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:513
+#: ../docs/guestfs-hacking.pod:522
 msgid "You can use guestfish to try out new commands."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:515
+#: ../docs/guestfs-hacking.pod:524
 msgid ""
 "Debugging the daemon is a problem because it runs inside a minimal "
 "environment.  However you can fprintf messages in the daemon to stderr, and "
@@ -17342,31 +17368,31 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:519
+#: ../docs/guestfs-hacking.pod:528
 msgid "ADDING A NEW LANGUAGE BINDING"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:521
+#: ../docs/guestfs-hacking.pod:530
 msgid ""
 "All language bindings must be generated by the generator (see the "
 "F<generator> subdirectory)."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:524
+#: ../docs/guestfs-hacking.pod:533
 msgid ""
 "There is no documentation for this yet.  We suggest you look at an existing "
 "binding, eg. F<generator/ocaml.ml> or F<generator/perl.ml>."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:528
+#: ../docs/guestfs-hacking.pod:537
 msgid "Adding tests for language bindings"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:530
+#: ../docs/guestfs-hacking.pod:539
 msgid ""
 "Language bindings should come with tests.  Previously testing of language "
 "bindings was rather ad-hoc, but we have been trying to formalize the set of "
@@ -17374,7 +17400,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:534
+#: ../docs/guestfs-hacking.pod:543
 msgid ""
 "Currently only the OCaml and Perl bindings actually implement the full set "
 "of tests, and the OCaml bindings are canonical, so you should emulate what "
@@ -17382,12 +17408,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:538
+#: ../docs/guestfs-hacking.pod:547
 msgid "This is the numbering scheme used by the tests:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:540
+#: ../docs/guestfs-hacking.pod:549
 #, no-wrap
 msgid ""
 " - 000+ basic tests:\n"
@@ -17395,7 +17421,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:542
+#: ../docs/guestfs-hacking.pod:551
 #, no-wrap
 msgid ""
 "   010  load the library\n"
@@ -17412,7 +17438,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:553
+#: ../docs/guestfs-hacking.pod:562
 #, no-wrap
 msgid ""
 " - 100  launch, create partitions and LVs and filesystems\n"
@@ -17420,7 +17446,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:555
+#: ../docs/guestfs-hacking.pod:564
 #, no-wrap
 msgid ""
 " - 400+ events:\n"
@@ -17428,7 +17454,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:557
+#: ../docs/guestfs-hacking.pod:566
 #, no-wrap
 msgid ""
 "   410  close event\n"
@@ -17438,7 +17464,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:561
+#: ../docs/guestfs-hacking.pod:570
 #, no-wrap
 msgid ""
 " - 800+ regression tests (specific to the language)\n"
@@ -17446,7 +17472,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:563
+#: ../docs/guestfs-hacking.pod:572
 #, no-wrap
 msgid ""
 " - 900+ any other custom tests for the language\n"
@@ -17454,19 +17480,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:565
+#: ../docs/guestfs-hacking.pod:574
 msgid ""
 "To save time when running the tests, only 100, 430, 800+, 900+ should launch "
 "the handle."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:568
+#: ../docs/guestfs-hacking.pod:577
 msgid "FORMATTING CODE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:570
+#: ../docs/guestfs-hacking.pod:579
 msgid ""
 "Our C source code generally adheres to some basic code-formatting "
 "conventions.  The existing code base is not totally consistent on this "
@@ -17476,14 +17502,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:576
+#: ../docs/guestfs-hacking.pod:585
 msgid ""
 "If you use Emacs, add the following to one of your start-up files (e.g., ~/."
 "emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:579
+#: ../docs/guestfs-hacking.pod:588
 #, no-wrap
 msgid ""
 " ;;; In libguestfs, indent with spaces everywhere (not TABs).\n"
@@ -17499,7 +17525,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:589
+#: ../docs/guestfs-hacking.pod:598
 #, no-wrap
 msgid ""
 " ;;; When editing C sources in libguestfs, use this style.\n"
@@ -17517,18 +17543,18 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:601
+#: ../docs/guestfs-hacking.pod:610
 msgid "TESTING YOUR CHANGES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:603
+#: ../docs/guestfs-hacking.pod:612
 msgid ""
 "Turn warnings into errors when developing to make warnings hard to ignore:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:606
+#: ../docs/guestfs-hacking.pod:615
 #, no-wrap
 msgid ""
 " ./configure --enable-werror\n"
@@ -17536,61 +17562,61 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:608
+#: ../docs/guestfs-hacking.pod:617
 msgid "Useful targets are:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:612
+#: ../docs/guestfs-hacking.pod:621
 msgid "C<make check>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:614
+#: ../docs/guestfs-hacking.pod:623
 msgid "Runs the regular test suite."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:616
+#: ../docs/guestfs-hacking.pod:625
 msgid ""
 "This is implemented using the regular automake C<TESTS> target.  See the "
 "automake documentation for details."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:619
+#: ../docs/guestfs-hacking.pod:628
 msgid "C<make check-valgrind>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:621
+#: ../docs/guestfs-hacking.pod:630
 msgid "Runs a subset of the test suite under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:623
+#: ../docs/guestfs-hacking.pod:632
 msgid "See L</VALGRIND> below."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:625
+#: ../docs/guestfs-hacking.pod:634
 msgid "C<make check-valgrind-local-guests>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:627
+#: ../docs/guestfs-hacking.pod:636
 msgid ""
 "Runs a subset of the test suite under valgrind using locally installed "
 "libvirt guests (read-only)."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:630
+#: ../docs/guestfs-hacking.pod:639
 msgid "C<make check-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:632
+#: ../docs/guestfs-hacking.pod:641
 msgid ""
 "Runs all tests using default appliance back-end.  This only has any effect "
 "if a non-default backend was selected using C<./configure --with-default-"
@@ -17598,36 +17624,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:636
+#: ../docs/guestfs-hacking.pod:645
 msgid "C<make check-valgrind-direct>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:638
+#: ../docs/guestfs-hacking.pod:647
 msgid ""
 "Run a subset of the test suite under valgrind using the default appliance "
 "back-end."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:641
+#: ../docs/guestfs-hacking.pod:650
 msgid "C<make check-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:643
+#: ../docs/guestfs-hacking.pod:652
 msgid "Runs all tests using the User-Mode Linux backend."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:645
+#: ../docs/guestfs-hacking.pod:654
 msgid ""
 "As there is no standard location for the User-Mode Linux kernel, you I<have> "
 "to set C<LIBGUESTFS_HV> to point to the kernel image, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:648
+#: ../docs/guestfs-hacking.pod:657
 #, no-wrap
 msgid ""
 " make check-uml LIBGUESTFS_HV=~/d/linux-um/vmlinux\n"
@@ -17635,27 +17661,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:650
+#: ../docs/guestfs-hacking.pod:659
 msgid "C<make check-valgrind-uml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:652
+#: ../docs/guestfs-hacking.pod:661
 msgid "Runs all tests using the User-Mode Linux backend, under valgrind."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:654
+#: ../docs/guestfs-hacking.pod:663
 msgid "As above, you have to set C<LIBGUESTFS_HV> to point to the kernel."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:656
+#: ../docs/guestfs-hacking.pod:665
 msgid "C<make check-with-upstream-qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:658
+#: ../docs/guestfs-hacking.pod:667
 msgid ""
 "Runs all tests using a local qemu binary.  It looks for the qemu binary in "
 "QEMUDIR (defaults to F<$HOME/d/qemu>), but you can set this to another "
@@ -17663,7 +17689,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:662
+#: ../docs/guestfs-hacking.pod:671
 #, no-wrap
 msgid ""
 " make check-with-upstream-qemu QEMUDIR=/usr/src/qemu\n"
@@ -17671,12 +17697,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:664
+#: ../docs/guestfs-hacking.pod:673
 msgid "C<make check-with-upstream-libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:666
+#: ../docs/guestfs-hacking.pod:675
 msgid ""
 "Runs all tests using a local libvirt.  This only has any effect if the "
 "libvirt backend was selected using C<./configure --with-default-"
@@ -17684,14 +17710,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:670
+#: ../docs/guestfs-hacking.pod:679
 msgid ""
 "It looks for libvirt in LIBVIRTDIR (defaults to F<$HOME/d/libvirt>), but you "
 "can set this to another directory on the command line, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:673
+#: ../docs/guestfs-hacking.pod:682
 #, no-wrap
 msgid ""
 " make check-with-upstream-libvirt LIBVIRTDIR=/usr/src/libvirt\n"
@@ -17699,29 +17725,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:675
+#: ../docs/guestfs-hacking.pod:684
 msgid "C<make check-slow>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:677
+#: ../docs/guestfs-hacking.pod:686
 msgid "Runs some slow/long-running tests which are not run by default."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:679
+#: ../docs/guestfs-hacking.pod:688
 msgid "To mark a test as slow/long-running:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:685 ../docs/guestfs-hacking.pod:721
+#: ../docs/guestfs-hacking.pod:694 ../docs/guestfs-hacking.pod:730
 msgid ""
 "Add it to the list of C<TESTS> in the F<Makefile.am>, just like a normal "
 "test."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:690
+#: ../docs/guestfs-hacking.pod:699
 msgid ""
 "Modify the test so it checks if the C<SLOW=1> environment variable is set, "
 "and if I<not> set it skips (ie. returns with exit code 77).  If using C<"
@@ -17729,18 +17755,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:697
+#: ../docs/guestfs-hacking.pod:706
 msgid ""
 "Add a variable C<SLOW_TESTS> to the F<Makefile.am> listing the slow tests."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:702 ../docs/guestfs-hacking.pod:737
+#: ../docs/guestfs-hacking.pod:711 ../docs/guestfs-hacking.pod:746
 msgid "Add a rule to the F<Makefile.am>:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:704
+#: ../docs/guestfs-hacking.pod:713
 #, no-wrap
 msgid ""
 " check-slow:\n"
@@ -17749,12 +17775,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:709
+#: ../docs/guestfs-hacking.pod:718
 msgid "C<sudo make check-root>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:711
+#: ../docs/guestfs-hacking.pod:720
 msgid ""
 "Runs some tests which require root privileges.  These are supposed to be "
 "safe, but take care.  You have to run this as root (eg. using L<sudo(8)> "
@@ -17762,12 +17788,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:715
+#: ../docs/guestfs-hacking.pod:724
 msgid "To mark a test as requiring root:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:726
+#: ../docs/guestfs-hacking.pod:735
 msgid ""
 "Modify the test so it checks if euid == 0, and if I<not> set it skips (ie. "
 "returns with exit code 77).  If using C<$TEST_FUNCTIONS>, you can call the "
@@ -17775,13 +17801,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:732
+#: ../docs/guestfs-hacking.pod:741
 msgid ""
 "Add a variable C<ROOT_TESTS> to the F<Makefile.am> listing the root tests."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:739
+#: ../docs/guestfs-hacking.pod:748
 #, no-wrap
 msgid ""
 " check-root:\n"
@@ -17790,76 +17816,76 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:744
+#: ../docs/guestfs-hacking.pod:753
 msgid "C<make check-all>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:746
+#: ../docs/guestfs-hacking.pod:755
 msgid "Equivalent to running all C<make check*> rules except C<check-root>."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:748
+#: ../docs/guestfs-hacking.pod:757
 msgid "C<make check-release>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:750
+#: ../docs/guestfs-hacking.pod:759
 msgid ""
 "Runs a subset of C<make check*> rules that are required to pass before a "
 "tarball can be released.  Currently this is:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:757
+#: ../docs/guestfs-hacking.pod:766
 msgid "check"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:761
+#: ../docs/guestfs-hacking.pod:770
 msgid "check-valgrind"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:765
+#: ../docs/guestfs-hacking.pod:774
 msgid "check-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:769
+#: ../docs/guestfs-hacking.pod:778
 msgid "check-valgrind-direct"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:773
+#: ../docs/guestfs-hacking.pod:782
 msgid "check-slow"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:777
+#: ../docs/guestfs-hacking.pod:786
 msgid "C<make installcheck>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:779
+#: ../docs/guestfs-hacking.pod:788
 msgid "Run C<make check> on the installed copy of libguestfs."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:781
+#: ../docs/guestfs-hacking.pod:790
 msgid ""
 "The version of installed libguestfs being tested, and the version of the "
 "libguestfs source tree must be the same."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:784
+#: ../docs/guestfs-hacking.pod:793
 msgid "Do:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:786
+#: ../docs/guestfs-hacking.pod:795
 #, no-wrap
 msgid ""
 " ./autogen.sh\n"
@@ -17870,32 +17896,32 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:793
+#: ../docs/guestfs-hacking.pod:802
 msgid "VALGRIND"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:795
+#: ../docs/guestfs-hacking.pod:804
 msgid ""
 "When you do C<make check-valgrind>, it searches for any F<Makefile.am> in "
 "the tree that has a C<check-valgrind:> target and runs it."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:798
+#: ../docs/guestfs-hacking.pod:807
 msgid ""
 "Writing the F<Makefile.am> and tests correctly to use valgrind and working "
 "with automake parallel tests is subtle."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:801
+#: ../docs/guestfs-hacking.pod:810
 msgid ""
 "If your tests are run via a shell script wrapper, then in the wrapper use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:804
+#: ../docs/guestfs-hacking.pod:813
 #, no-wrap
 msgid ""
 " $VG virt-foo\n"
@@ -17903,12 +17929,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:806
+#: ../docs/guestfs-hacking.pod:815
 msgid "and in the F<Makefile.am> use:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:808 ../docs/guestfs-hacking.pod:816
+#: ../docs/guestfs-hacking.pod:817 ../docs/guestfs-hacking.pod:825
 #, no-wrap
 msgid ""
 " check-valgrind:\n"
@@ -17917,14 +17943,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:811
+#: ../docs/guestfs-hacking.pod:820
 msgid ""
 "However, if your binaries run directly from the C<TESTS> rule, you have to "
 "modify the F<Makefile.am> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:814
+#: ../docs/guestfs-hacking.pod:823
 #, no-wrap
 msgid ""
 " LOG_COMPILER = $(VG)\n"
@@ -17932,69 +17958,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:819
+#: ../docs/guestfs-hacking.pod:828
 msgid ""
 "In either case, check that the right program is being tested by examining "
 "the F<tmp/valgrind*> log files carefully."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:822
+#: ../docs/guestfs-hacking.pod:831
 msgid "SUBMITTING PATCHES"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:824
+#: ../docs/guestfs-hacking.pod:833
 msgid ""
 "Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
 "libguestfs> and CC to L<rjones@redhat.com>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:828
+#: ../docs/guestfs-hacking.pod:837
 msgid ""
 "You do not need to subscribe to the mailing list if you don’t want to.  "
 "There may be a short delay while your message is moderated."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:831
+#: ../docs/guestfs-hacking.pod:840
 msgid "DAEMON CUSTOM PRINTF FORMATTERS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:833
+#: ../docs/guestfs-hacking.pod:842
 msgid ""
 "In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
 "which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:838
+#: ../docs/guestfs-hacking.pod:847
 msgid "%Q"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:840
+#: ../docs/guestfs-hacking.pod:849
 msgid ""
 "Simple shell quoted string.  Any spaces or other shell characters are "
 "escaped for you."
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:843
+#: ../docs/guestfs-hacking.pod:852
 msgid "%R"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:845
+#: ../docs/guestfs-hacking.pod:854
 msgid ""
 "Same as C<%Q> except the string is treated as a path which is prefixed by "
 "the sysroot."
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:852
+#: ../docs/guestfs-hacking.pod:861
 #, no-wrap
 msgid ""
 " asprintf (&cmd, \"cat %R\", path);\n"
@@ -18002,12 +18028,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:854
+#: ../docs/guestfs-hacking.pod:863
 msgid "would produce C<cat /sysroot/some\\ path\\ with\\ spaces>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:856
+#: ../docs/guestfs-hacking.pod:865
 msgid ""
 "I<Note:> Do I<not> use these when you are passing parameters to the "
 "C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
@@ -18016,17 +18042,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:862
+#: ../docs/guestfs-hacking.pod:871
 msgid "INTERNATIONALIZATION (I18N) SUPPORT"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:864
+#: ../docs/guestfs-hacking.pod:873
 msgid "We support i18n (gettext anyhow) in the library."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:866
+#: ../docs/guestfs-hacking.pod:875
 msgid ""
 "However many messages come from the daemon, and we don’t translate those at "
 "the moment.  One reason is that the appliance generally has all locale files "
@@ -18035,31 +18061,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:872
+#: ../docs/guestfs-hacking.pod:881
 msgid ""
 "Debugging messages are never translated, since they are intended for the "
 "programmers."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:875
+#: ../docs/guestfs-hacking.pod:884
 msgid "MISCELLANEOUS TOPICS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:877
+#: ../docs/guestfs-hacking.pod:886
 msgid "HOW OCAML PROGRAMS ARE COMPILED AND LINKED"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:879
+#: ../docs/guestfs-hacking.pod:888
 msgid ""
 "Mostly this section is \"how we make automake & ocamlopt work together\" "
 "since OCaml programs themselves are easy to compile."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:882
+#: ../docs/guestfs-hacking.pod:891
 msgid ""
 "Automake has no native support for OCaml programs, ocamlc nor ocamlopt.  "
 "What we do instead is to treat OCaml programs as C programs which happen to "
@@ -18069,12 +18095,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:888
+#: ../docs/guestfs-hacking.pod:897
 msgid "So a typical program is described as just its C sources:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:890
+#: ../docs/guestfs-hacking.pod:899
 #, no-wrap
 msgid ""
 " virt_v2v_SOURCES = ... utils-c.c xml-c.c\n"
@@ -18082,14 +18108,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:892
+#: ../docs/guestfs-hacking.pod:901
 msgid ""
 "For programs that have no explicit C sources, we create an empty F<dummy.c> "
 "file, and list that instead:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:895
+#: ../docs/guestfs-hacking.pod:904
 #, no-wrap
 msgid ""
 " virt_resize_SOURCES = dummy.c\n"
@@ -18097,14 +18123,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:897
+#: ../docs/guestfs-hacking.pod:906
 msgid ""
 "The OCaml objects which contain most of the code are listed as automake "
 "dependencies (other dependencies may also be listed):"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:900
+#: ../docs/guestfs-hacking.pod:909
 #, no-wrap
 msgid ""
 " virt_v2v_DEPENDENCIES = ... cmdline.cmx v2v.cmx\n"
@@ -18112,7 +18138,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:902
+#: ../docs/guestfs-hacking.pod:911
 msgid ""
 "The only other special thing we need to do is to provide a custom link "
 "command.  This is needed because automake won't assemble the ocamlopt "
@@ -18121,7 +18147,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:907
+#: ../docs/guestfs-hacking.pod:916
 #, no-wrap
 msgid ""
 " virt_v2v_LINK = \\\n"
@@ -18130,48 +18156,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:910
+#: ../docs/guestfs-hacking.pod:919
 msgid ""
 "The actual rules, which you can examine in F<v2v/Makefile.am>, are a little "
 "bit more complicated than this because they have to handle:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:917
+#: ../docs/guestfs-hacking.pod:926
 msgid "Compiling for byte code or native code."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:921
+#: ../docs/guestfs-hacking.pod:930
 msgid "The pattern rules needed to compile the OCaml sources to objects."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:923
+#: ../docs/guestfs-hacking.pod:932
 msgid ""
 "These are now kept in F<subdir-rules.mk> at the top level, which is included "
 "in every subdirectory F<Makefile.am>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:928
+#: ../docs/guestfs-hacking.pod:937
 msgid "Adding OCaml sources files to C<EXTRA_DIST>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:930
+#: ../docs/guestfs-hacking.pod:939
 msgid ""
 "Automake isn't aware of the complete list of sources for a binary, so it "
 "will not add them all automatically."
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:935
+#: ../docs/guestfs-hacking.pod:944
 msgid "VIRT-V2V"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:937
+#: ../docs/guestfs-hacking.pod:946
 msgid ""
 "First a little history.  Virt-v2v has been through at least two complete "
 "rewrites, so this is probably about the third version (but we don't intend "
@@ -18180,7 +18206,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:943
+#: ../docs/guestfs-hacking.pod:952
 msgid ""
 "The current version started out as almost a line-for-line rewrite of the "
 "Perl code in OCaml + C, and it still has a fairly similar structure.  "
@@ -18190,22 +18216,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:949
+#: ../docs/guestfs-hacking.pod:958
 msgid "The files to start with when reading this code are:"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:955
+#: ../docs/guestfs-hacking.pod:964
 msgid "F<types.mli>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:959
+#: ../docs/guestfs-hacking.pod:968
 msgid "F<v2v.ml>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:963
+#: ../docs/guestfs-hacking.pod:972
 msgid ""
 "F<types.mli> defines all the structures used and passed around when "
 "communicating between different bits of the program.  F<v2v.ml> controls how "
@@ -18213,7 +18239,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:967
+#: ../docs/guestfs-hacking.pod:976
 msgid ""
 "After studying those files, you may want to branch out into the input "
 "modules (F<input_*>), the output modules (F<output_*>) or the conversion "
@@ -18223,7 +18249,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:974
+#: ../docs/guestfs-hacking.pod:983
 msgid ""
 "Every other file in this directory is a support module / library of some "
 "sort.  Some code is written in C, especially where we want to use an "
@@ -18231,29 +18257,29 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:978
+#: ../docs/guestfs-hacking.pod:987
 msgid "MAINTAINER TASKS"
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:980
+#: ../docs/guestfs-hacking.pod:989
 msgid "MAINTAINER MAKEFILE TARGETS"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:982
+#: ../docs/guestfs-hacking.pod:991
 msgid ""
 "These C<make> targets probably won’t work and aren't useful unless you are a "
 "libguestfs maintainer."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:985
+#: ../docs/guestfs-hacking.pod:994
 msgid "make maintainer-commit"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:987
+#: ../docs/guestfs-hacking.pod:996
 msgid ""
 "This commits everything in the working directory with the commit message "
 "C<Version $(VERSION).>.  You must update F<configure.ac>, clean and rebuild "
@@ -18261,19 +18287,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:991
+#: ../docs/guestfs-hacking.pod:1000
 msgid "make maintainer-tag"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:993
+#: ../docs/guestfs-hacking.pod:1002
 msgid ""
 "This tags the current HEAD commit with the tag C<v$(VERSION)> and one of the "
 "messages:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:996
+#: ../docs/guestfs-hacking.pod:1005
 #, no-wrap
 msgid ""
 " Version $(VERSION) stable\n"
@@ -18281,7 +18307,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:998
+#: ../docs/guestfs-hacking.pod:1007
 #, no-wrap
 msgid ""
 " Version $(VERSION) development\n"
@@ -18289,31 +18315,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1000
+#: ../docs/guestfs-hacking.pod:1009
 msgid ""
 "(See L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for the difference between a "
 "stable and development release.)"
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1003
+#: ../docs/guestfs-hacking.pod:1012
 msgid "make maintainer-check-authors"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1005
+#: ../docs/guestfs-hacking.pod:1014
 msgid ""
 "Check that all authors (found in git commit messages) are included in the "
 "F<generator/authors.ml> file."
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1008
+#: ../docs/guestfs-hacking.pod:1017
 msgid "make maintainer-check-extra-dist"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1010
+#: ../docs/guestfs-hacking.pod:1019
 msgid ""
 "This rule must be run after C<make dist> (so there is a tarball in the "
 "working directory).  It compares the contents of the tarball with the "
@@ -18322,12 +18348,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../docs/guestfs-hacking.pod:1015
+#: ../docs/guestfs-hacking.pod:1024
 msgid "make maintainer-upload-website"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1017
+#: ../docs/guestfs-hacking.pod:1026
 msgid ""
 "This is used by the software used to automate libguestfs releases to copy "
 "the libguestfs website to another git repository before it is uploaded to "
@@ -18335,12 +18361,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../docs/guestfs-hacking.pod:1021
+#: ../docs/guestfs-hacking.pod:1030
 msgid "MAKING A STABLE RELEASE"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1023
+#: ../docs/guestfs-hacking.pod:1032
 msgid ""
 "When we make a stable release, there are several steps documented here.  See "
 "L<guestfs(3)/LIBGUESTFS VERSION NUMBERS> for general information about the "
@@ -18348,63 +18374,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1031
+#: ../docs/guestfs-hacking.pod:1040
 msgid "Check C<make && make check> works on at least:"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1035
+#: ../docs/guestfs-hacking.pod:1044
 msgid "Fedora (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1037
+#: ../docs/guestfs-hacking.pod:1046
 msgid "Debian (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1039
+#: ../docs/guestfs-hacking.pod:1048
 msgid "Ubuntu (x86-64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1041
+#: ../docs/guestfs-hacking.pod:1050
 msgid "Fedora (aarch64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1043
+#: ../docs/guestfs-hacking.pod:1052
 msgid "Fedora (ppc64)"
 msgstr ""
 
 #. type: =item
-#: ../docs/guestfs-hacking.pod:1045
+#: ../docs/guestfs-hacking.pod:1054
 msgid "Fedora (ppc64le)"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1051
+#: ../docs/guestfs-hacking.pod:1060
 msgid "Check C<./configure --without-libvirt> works."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1055
+#: ../docs/guestfs-hacking.pod:1064
 msgid "Finalize F<guestfs-release-notes.pod>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1059
+#: ../docs/guestfs-hacking.pod:1068
 msgid "Push and pull from Zanata."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1061 ../docs/guestfs-testing.pod:30
+#: ../docs/guestfs-hacking.pod:1070 ../docs/guestfs-testing.pod:30
 #: ../docs/guestfs-testing.pod:215
 msgid "Run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1063
+#: ../docs/guestfs-hacking.pod:1072
 #, no-wrap
 msgid ""
 " zanata push\n"
@@ -18412,12 +18438,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1065
+#: ../docs/guestfs-hacking.pod:1074
 msgid "to push the latest POT files to Zanata.  Then run:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1067
+#: ../docs/guestfs-hacking.pod:1076
 #, no-wrap
 msgid ""
 " ./zanata-pull.sh\n"
@@ -18425,36 +18451,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1069
+#: ../docs/guestfs-hacking.pod:1078
 msgid "which is a wrapper to pull the latest translated F<*.po> files."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1073
+#: ../docs/guestfs-hacking.pod:1082
 msgid "Consider updating gnulib to latest upstream version."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1077
+#: ../docs/guestfs-hacking.pod:1086
 msgid ""
 "Create new stable and development directories under L<http://libguestfs.org/"
 "download>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1082
+#: ../docs/guestfs-hacking.pod:1091
 msgid "Edit F<website/index.html.in>."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1086
+#: ../docs/guestfs-hacking.pod:1095
 msgid ""
 "Set the version (in F<configure.ac>) to the new I<stable> version, ie. 1."
 "XX.0, and commit it:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1089
+#: ../docs/guestfs-hacking.pod:1098
 #, no-wrap
 msgid ""
 " ./localconfigure\n"
@@ -18467,12 +18493,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1098
+#: ../docs/guestfs-hacking.pod:1107
 msgid "Create the stable branch in git:"
 msgstr ""
 
 #. type: verbatim
-#: ../docs/guestfs-hacking.pod:1100
+#: ../docs/guestfs-hacking.pod:1109
 #, no-wrap
 msgid ""
 " git branch stable-1.XX\n"
@@ -18481,50 +18507,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1105
+#: ../docs/guestfs-hacking.pod:1114
 msgid "Do a full release of the stable branch."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1109
+#: ../docs/guestfs-hacking.pod:1118
 msgid ""
 "Set the version to the next development version and commit that.  Optionally "
 "do a full release of the development branch."
 msgstr ""
 
 #. type: =head1
-#: ../docs/guestfs-hacking.pod:1114
+#: ../docs/guestfs-hacking.pod:1123
 msgid "INTERNAL DOCUMENTATION"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1116
+#: ../docs/guestfs-hacking.pod:1125
 msgid ""
 "This section documents internal functions inside libguestfs and various "
 "utilities.  It is intended for libguestfs developers only."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1119
+#: ../docs/guestfs-hacking.pod:1128
 msgid ""
 "This section is autogenerated from C</**> comments in source files, which "
 "are marked up in POD format."
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1122
+#: ../docs/guestfs-hacking.pod:1131
 msgid ""
 "B<These functions are not publicly exported, and may change or be removed at "
 "any time.>"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1125
+#: ../docs/guestfs-hacking.pod:1134
 msgid "__INTERNAL_DOCUMENTATION__"
 msgstr ""
 
 #. type: textblock
-#: ../docs/guestfs-hacking.pod:1129
+#: ../docs/guestfs-hacking.pod:1138
 msgid ""
 "L<guestfs(3)>, L<guestfs-building(1)>, L<guestfs-examples(3)>, L<guestfs-"
 "internals(1)>, L<guestfs-performance(1)>, L<guestfs-release-notes(1)>, "
diff --git a/po/POTFILES b/po/POTFILES
index 2409ef72a..56fa10de8 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -15,6 +15,7 @@ common/edit/file-edit.c
 common/errnostring/errnostring-gperf.c
 common/errnostring/errnostring.c
 common/mlaugeas/augeas-c.c
+common/mlcustomize/dummy.c
 common/mlgettext/dummy.c
 common/mllibvirt/generator.pl
 common/mllibvirt/libvirt_c_epilogue.c
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 8ef5313c8..99f98d768 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -19,6 +19,9 @@ builder/simplestreams_parser.ml
 builder/sources.ml
 builder/utils.ml
 common/mlaugeas/augeas.ml
+common/mlcustomize/SELinux_relabel.ml
+common/mlcustomize/customize_cmdline.ml
+common/mlcustomize/firstboot.ml
 common/mlgettext/common_gettext.ml
 common/mllibvirt/libvirt.ml
 common/mlpcre/PCRE.ml
@@ -50,16 +53,15 @@ common/mltools/xpath_helpers.ml
 common/mlutils/c_utils.ml
 common/mlutils/c_utils_unit_tests.ml
 common/mlutils/unix_utils.ml
+common/mlv2v/uefi.ml
 common/mlvisit/visit.ml
 common/mlvisit/visit_tests.ml
 common/mlxml/xml.ml
-customize/SELinux_relabel.ml
 customize/append_line.ml
 customize/crypt.ml
 customize/customize_cmdline.ml
 customize/customize_main.ml
 customize/customize_run.ml
-customize/firstboot.ml
 customize/hostname.ml
 customize/password.ml
 customize/perl_edit.ml
diff --git a/po/cs.po b/po/cs.po
index 072fef1a2..13bdcbb4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-09-11 04:50+0000\n"
 "Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -211,7 +211,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -488,6 +488,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -672,25 +674,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -828,10 +830,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -856,6 +860,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -884,6 +889,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -947,6 +953,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -963,11 +970,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1017,11 +1024,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1037,10 +1044,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1057,11 +1066,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1073,6 +1082,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1085,11 +1095,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1097,10 +1108,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1129,10 +1141,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1252,6 +1266,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1353,7 +1368,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1366,26 +1381,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1424,7 +1447,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1520,6 +1543,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1560,10 +1584,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1639,6 +1664,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1707,6 +1733,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1771,7 +1798,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1794,7 +1821,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1880,19 +1907,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1955,6 +1988,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1963,6 +2002,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1971,6 +2011,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1979,6 +2020,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1987,6 +2029,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2027,6 +2070,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2208,18 +2252,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2234,6 +2282,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2250,12 +2299,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2264,6 +2318,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2344,10 +2400,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2456,10 +2514,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2476,6 +2536,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2484,6 +2545,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2492,6 +2554,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2556,7 +2619,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2572,10 +2635,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2754,11 +2819,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2769,7 +2834,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2794,6 +2859,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2806,10 +2872,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2826,6 +2894,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2834,6 +2903,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2842,6 +2912,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2850,6 +2921,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2890,6 +2962,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2908,6 +2986,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2953,21 +3032,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3061,7 +3135,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3113,7 +3187,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3123,16 +3197,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3155,7 +3231,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3180,13 +3256,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3227,7 +3303,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3287,7 +3363,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3531,7 +3607,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3564,7 +3640,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3593,7 +3669,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3608,11 +3684,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3683,7 +3759,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3716,11 +3792,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3744,6 +3820,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3847,6 +3925,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3907,11 +3986,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3919,6 +4032,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3929,7 +4046,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4041,7 +4162,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4159,7 +4280,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4241,7 +4362,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4299,7 +4420,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4343,35 +4464,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4429,7 +4550,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4618,7 +4739,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4778,7 +4899,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4949,7 +5070,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5066,6 +5187,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 6f5440e54..12a068d27 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:48+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -496,6 +496,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -680,25 +682,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -836,10 +838,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -864,6 +868,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -892,6 +897,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -955,6 +961,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -971,11 +978,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1025,11 +1032,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1045,10 +1052,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1065,11 +1074,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1081,6 +1090,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1093,11 +1103,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1105,10 +1116,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1137,10 +1149,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1260,6 +1274,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1361,7 +1376,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1374,26 +1389,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1432,7 +1455,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1528,6 +1551,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1568,10 +1592,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1647,6 +1672,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1715,6 +1741,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1779,7 +1806,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1802,7 +1829,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1888,19 +1915,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1963,6 +1996,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1971,6 +2010,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1979,6 +2019,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1987,6 +2028,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1995,6 +2037,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2035,6 +2078,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2216,18 +2260,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2242,6 +2290,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2258,12 +2307,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2272,6 +2326,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2352,10 +2408,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2464,10 +2522,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2484,6 +2544,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2492,6 +2553,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2500,6 +2562,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2564,7 +2627,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2580,10 +2643,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2762,11 +2827,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2777,7 +2842,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2802,6 +2867,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2814,10 +2880,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2834,6 +2902,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2842,6 +2911,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2850,6 +2920,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2858,6 +2929,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2898,6 +2970,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2916,6 +2994,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2961,21 +3040,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3069,7 +3143,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3121,7 +3195,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3131,16 +3205,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3163,7 +3239,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3188,13 +3264,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3235,7 +3311,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3295,7 +3371,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3539,7 +3615,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3572,7 +3648,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3601,7 +3677,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3616,11 +3692,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3691,7 +3767,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3724,11 +3800,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3752,6 +3828,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3855,6 +3933,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3915,11 +3994,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3927,6 +4040,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3937,7 +4054,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4049,7 +4170,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4167,7 +4288,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4249,7 +4370,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4307,7 +4428,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4351,35 +4472,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4437,7 +4558,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4626,7 +4747,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4784,7 +4905,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4955,7 +5076,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5072,6 +5193,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c9194267..1282a3408 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:48+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 532318d75..9227bb764 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-03-16 07:04+0000\n"
 "Last-Translator: Alex Puchades <alex94puchades@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -497,6 +497,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -681,25 +683,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -837,10 +839,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -865,6 +869,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -893,6 +898,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -956,6 +962,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -972,11 +979,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1026,11 +1033,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1046,10 +1053,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1066,11 +1075,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1082,6 +1091,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1094,11 +1104,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1106,10 +1117,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1138,10 +1150,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1261,6 +1275,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1362,7 +1377,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1375,26 +1390,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1433,7 +1456,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1529,6 +1552,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1569,10 +1593,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1648,6 +1673,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1716,6 +1742,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1780,7 +1807,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1803,7 +1830,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1889,19 +1916,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1964,6 +1997,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1972,6 +2011,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1980,6 +2020,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1988,6 +2029,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1996,6 +2038,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2036,6 +2079,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2217,18 +2261,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2243,6 +2291,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2259,12 +2308,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2273,6 +2327,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2353,10 +2409,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2465,10 +2523,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2485,6 +2545,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2493,6 +2554,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2501,6 +2563,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2565,7 +2628,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2581,10 +2644,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2763,11 +2828,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2778,7 +2843,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2803,6 +2868,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2815,10 +2881,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2835,6 +2903,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2843,6 +2912,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2851,6 +2921,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2859,6 +2930,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2899,6 +2971,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2917,6 +2995,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2962,21 +3041,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3070,7 +3144,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3122,7 +3196,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3132,16 +3206,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3164,7 +3240,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3189,13 +3265,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3236,7 +3312,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3296,7 +3372,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3540,7 +3616,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3573,7 +3649,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3602,7 +3678,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3617,11 +3693,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3692,7 +3768,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3725,11 +3801,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3753,6 +3829,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3856,6 +3934,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3916,11 +3995,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3928,6 +4041,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3938,7 +4055,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4050,7 +4171,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4168,7 +4289,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4250,7 +4371,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4308,7 +4429,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4352,35 +4473,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4438,7 +4559,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4627,7 +4748,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4785,7 +4906,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4956,7 +5077,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5073,6 +5194,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 1c8eef44c..f27298de5 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 88c420056..7c2a6bdc5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -497,6 +497,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -681,25 +683,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -837,10 +839,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -865,6 +869,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -893,6 +898,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -956,6 +962,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -972,11 +979,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1026,11 +1033,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1046,10 +1053,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1066,11 +1075,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1082,6 +1091,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1094,11 +1104,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1106,10 +1117,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1138,10 +1150,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1261,6 +1275,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1362,7 +1377,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1375,26 +1390,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1433,7 +1456,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1529,6 +1552,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1569,10 +1593,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1648,6 +1673,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1716,6 +1742,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1780,7 +1807,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1803,7 +1830,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1889,19 +1916,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1964,6 +1997,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1972,6 +2011,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1980,6 +2020,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1988,6 +2029,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1996,6 +2038,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2036,6 +2079,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2217,18 +2261,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2243,6 +2291,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2259,12 +2308,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2273,6 +2327,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2353,10 +2409,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2465,10 +2523,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2485,6 +2545,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2493,6 +2554,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2501,6 +2563,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2565,7 +2628,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2581,10 +2644,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2763,11 +2828,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2778,7 +2843,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2803,6 +2868,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2815,10 +2881,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2835,6 +2903,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2843,6 +2912,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2851,6 +2921,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2859,6 +2930,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2899,6 +2971,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2917,6 +2995,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2962,21 +3041,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3070,7 +3144,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3122,7 +3196,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3132,16 +3206,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3164,7 +3240,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3189,13 +3265,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3236,7 +3312,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3296,7 +3372,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3540,7 +3616,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3573,7 +3649,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3602,7 +3678,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3617,11 +3693,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3692,7 +3768,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3725,11 +3801,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3753,6 +3829,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3856,6 +3934,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3916,11 +3995,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3928,6 +4041,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3938,7 +4055,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4050,7 +4171,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4168,7 +4289,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4250,7 +4371,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4308,7 +4429,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4352,35 +4473,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4438,7 +4559,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4627,7 +4748,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4785,7 +4906,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4956,7 +5077,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5073,6 +5194,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 3a54391b6..2de292f7a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -495,6 +495,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -679,25 +681,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -835,10 +837,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -863,6 +867,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -891,6 +896,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -954,6 +960,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -970,11 +977,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1024,11 +1031,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1044,10 +1051,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1064,11 +1073,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1080,6 +1089,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1092,11 +1102,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1104,10 +1115,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1136,10 +1148,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1259,6 +1273,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1360,7 +1375,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1373,26 +1388,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1431,7 +1454,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1527,6 +1550,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1567,10 +1591,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1646,6 +1671,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1714,6 +1740,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1778,7 +1805,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1801,7 +1828,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1887,19 +1914,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1962,6 +1995,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1970,6 +2009,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1978,6 +2018,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1986,6 +2027,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1994,6 +2036,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2034,6 +2077,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2215,18 +2259,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2241,6 +2289,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2257,12 +2306,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2271,6 +2325,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2351,10 +2407,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2463,10 +2521,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2483,6 +2543,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2491,6 +2552,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2499,6 +2561,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2563,7 +2626,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2579,10 +2642,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2761,11 +2826,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2776,7 +2841,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2801,6 +2866,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2813,10 +2879,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2833,6 +2901,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2841,6 +2910,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2849,6 +2919,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2857,6 +2928,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2897,6 +2969,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2915,6 +2993,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2960,21 +3039,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3068,7 +3142,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3120,7 +3194,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3130,16 +3204,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3162,7 +3238,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3187,13 +3263,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3234,7 +3310,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3294,7 +3370,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3538,7 +3614,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3571,7 +3647,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3600,7 +3676,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3615,11 +3691,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3690,7 +3766,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3723,11 +3799,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3751,6 +3827,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3854,6 +3932,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3914,11 +3993,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3926,6 +4039,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3936,7 +4053,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4048,7 +4169,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4166,7 +4287,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4248,7 +4369,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4306,7 +4427,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4350,35 +4471,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4436,7 +4557,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4625,7 +4746,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4783,7 +4904,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4954,7 +5075,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5071,6 +5192,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 54dc618f7..2b06f7840 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -495,6 +495,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -679,25 +681,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -835,10 +837,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -863,6 +867,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -891,6 +896,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -954,6 +960,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -970,11 +977,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1024,11 +1031,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1044,10 +1051,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1064,11 +1073,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1080,6 +1089,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1092,11 +1102,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1104,10 +1115,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1136,10 +1148,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1259,6 +1273,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1360,7 +1375,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1373,26 +1388,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1431,7 +1454,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1527,6 +1550,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1567,10 +1591,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1646,6 +1671,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1714,6 +1740,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1778,7 +1805,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1801,7 +1828,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1887,19 +1914,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1962,6 +1995,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1970,6 +2009,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1978,6 +2018,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1986,6 +2027,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1994,6 +2036,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2034,6 +2077,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2215,18 +2259,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2241,6 +2289,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2257,12 +2306,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2271,6 +2325,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2351,10 +2407,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2463,10 +2521,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2483,6 +2543,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2491,6 +2552,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2499,6 +2561,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2563,7 +2626,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2579,10 +2642,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2761,11 +2826,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2776,7 +2841,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2801,6 +2866,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2813,10 +2879,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2833,6 +2901,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2841,6 +2910,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2849,6 +2919,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2857,6 +2928,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2897,6 +2969,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2915,6 +2993,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2960,21 +3039,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3068,7 +3142,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3120,7 +3194,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3130,16 +3204,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3162,7 +3238,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3187,13 +3263,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3234,7 +3310,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3294,7 +3370,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3538,7 +3614,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3571,7 +3647,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3600,7 +3676,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3615,11 +3691,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3690,7 +3766,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3723,11 +3799,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3751,6 +3827,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3854,6 +3932,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3914,11 +3993,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3926,6 +4039,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3936,7 +4053,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4048,7 +4169,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4166,7 +4287,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4248,7 +4369,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4306,7 +4427,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4350,35 +4471,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4436,7 +4557,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4625,7 +4746,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4783,7 +4904,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4954,7 +5075,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5071,6 +5192,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 0d1f96bcb..7ea168c28 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2017-02-24 07:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -496,6 +496,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -680,25 +682,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -836,10 +838,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -864,6 +868,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -892,6 +897,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -955,6 +961,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -971,11 +978,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1025,11 +1032,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1045,10 +1052,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1065,11 +1074,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1081,6 +1090,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1093,11 +1103,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1105,10 +1116,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1137,10 +1149,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1260,6 +1274,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1361,7 +1376,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1374,26 +1389,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1432,7 +1455,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1528,6 +1551,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1568,10 +1592,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1647,6 +1672,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1715,6 +1741,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1779,7 +1806,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1802,7 +1829,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1888,19 +1915,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1963,6 +1996,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1971,6 +2010,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1979,6 +2019,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1987,6 +2028,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1995,6 +2037,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2035,6 +2078,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2216,18 +2260,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2242,6 +2290,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2258,12 +2307,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2272,6 +2326,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2352,10 +2408,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2464,10 +2522,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2484,6 +2544,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2492,6 +2553,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2500,6 +2562,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2564,7 +2627,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2580,10 +2643,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2762,11 +2827,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2777,7 +2842,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2802,6 +2867,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2814,10 +2880,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2834,6 +2902,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2842,6 +2911,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2850,6 +2920,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2858,6 +2929,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2898,6 +2970,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2916,6 +2994,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2961,21 +3040,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3069,7 +3143,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3121,7 +3195,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3131,16 +3205,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3163,7 +3239,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3188,13 +3264,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3235,7 +3311,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3295,7 +3371,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3539,7 +3615,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3572,7 +3648,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3601,7 +3677,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3616,11 +3692,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3691,7 +3767,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3724,11 +3800,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3752,6 +3828,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3855,6 +3933,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3915,11 +3994,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3927,6 +4040,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3937,7 +4054,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4049,7 +4170,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4167,7 +4288,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4249,7 +4370,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4307,7 +4428,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4351,35 +4472,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4437,7 +4558,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4626,7 +4747,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 1edd68886..a3298ad04 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4780,7 +4901,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4951,7 +5072,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5068,6 +5189,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 9ee5d33c2..2c5aa6e96 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.41.5\n"
+"Project-Id-Version: libguestfs 1.41.6\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 13:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -215,7 +215,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -492,6 +492,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -676,25 +678,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -832,10 +834,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -860,6 +864,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -888,6 +893,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -951,6 +957,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -967,11 +974,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1021,11 +1028,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1041,10 +1048,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1061,11 +1070,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1077,6 +1086,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1089,11 +1099,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1101,10 +1112,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1133,10 +1145,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1256,6 +1270,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1357,7 +1372,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1370,26 +1385,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1428,7 +1451,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1524,6 +1547,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1564,10 +1588,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1643,6 +1668,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1711,6 +1737,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1775,7 +1802,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1798,7 +1825,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1884,19 +1911,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1959,6 +1992,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1967,6 +2006,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1975,6 +2015,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1983,6 +2024,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1991,6 +2033,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2031,6 +2074,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2212,18 +2256,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2238,6 +2286,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2254,12 +2303,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2268,6 +2322,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2348,10 +2404,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2460,10 +2518,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2480,6 +2540,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2488,6 +2549,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2496,6 +2558,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2560,7 +2623,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2576,10 +2639,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2758,11 +2823,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2773,7 +2838,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2798,6 +2863,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2810,10 +2876,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2830,6 +2898,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2838,6 +2907,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2846,6 +2916,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2854,6 +2925,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2894,6 +2966,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2912,6 +2990,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2957,21 +3036,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3065,7 +3139,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3117,7 +3191,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3127,16 +3201,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3159,7 +3235,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3184,13 +3260,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3231,7 +3307,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3291,7 +3367,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3535,7 +3611,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3568,7 +3644,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3597,7 +3673,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3612,11 +3688,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3687,7 +3763,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3720,11 +3796,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3748,6 +3824,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3851,6 +3929,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3911,11 +3990,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3923,6 +4036,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3933,7 +4050,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4045,7 +4166,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4163,7 +4284,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4245,7 +4366,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4303,7 +4424,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4347,35 +4468,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4433,7 +4554,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4622,7 +4743,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4780,7 +4901,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4951,7 +5072,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5068,6 +5189,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index cd4765533..ed953015d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 15454b4a5..008e61477 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -495,6 +495,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -679,25 +681,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -835,10 +837,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -863,6 +867,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -891,6 +896,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -954,6 +960,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -970,11 +977,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1024,11 +1031,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1044,10 +1051,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1064,11 +1073,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1080,6 +1089,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1092,11 +1102,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1104,10 +1115,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1136,10 +1148,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1259,6 +1273,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1360,7 +1375,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1373,26 +1388,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1431,7 +1454,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1527,6 +1550,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1567,10 +1591,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1646,6 +1671,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1714,6 +1740,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1778,7 +1805,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1801,7 +1828,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1887,19 +1914,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1962,6 +1995,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1970,6 +2009,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1978,6 +2018,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1986,6 +2027,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1994,6 +2036,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2034,6 +2077,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2215,18 +2259,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2241,6 +2289,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2257,12 +2306,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2271,6 +2325,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2351,10 +2407,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2463,10 +2521,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2483,6 +2543,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2491,6 +2552,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2499,6 +2561,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2563,7 +2626,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2579,10 +2642,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2761,11 +2826,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2776,7 +2841,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2801,6 +2866,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2813,10 +2879,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2833,6 +2901,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2841,6 +2910,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2849,6 +2919,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2857,6 +2928,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2897,6 +2969,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2915,6 +2993,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2960,21 +3039,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3068,7 +3142,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3120,7 +3194,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3130,16 +3204,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3162,7 +3238,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3187,13 +3263,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3234,7 +3310,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3294,7 +3370,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3538,7 +3614,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3571,7 +3647,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3600,7 +3676,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3615,11 +3691,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3690,7 +3766,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3723,11 +3799,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3751,6 +3827,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3854,6 +3932,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3914,11 +3993,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3926,6 +4039,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3936,7 +4053,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4048,7 +4169,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4166,7 +4287,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4248,7 +4369,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4306,7 +4427,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4350,35 +4471,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4436,7 +4557,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4625,7 +4746,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4783,7 +4904,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4954,7 +5075,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5071,6 +5192,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 73acdbdad..c21046137 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -219,7 +219,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -496,6 +496,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -680,25 +682,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -836,10 +838,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -864,6 +868,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -892,6 +897,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -955,6 +961,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -971,11 +978,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1025,11 +1032,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1045,10 +1052,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1065,11 +1074,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1081,6 +1090,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1093,11 +1103,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1105,10 +1116,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1137,10 +1149,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1260,6 +1274,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1361,7 +1376,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1374,26 +1389,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1432,7 +1455,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1528,6 +1551,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1568,10 +1592,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1647,6 +1672,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1715,6 +1741,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1779,7 +1806,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1802,7 +1829,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1888,19 +1915,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1963,6 +1996,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1971,6 +2010,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1979,6 +2019,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1987,6 +2028,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1995,6 +2037,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2035,6 +2078,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2216,18 +2260,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2242,6 +2290,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2258,12 +2307,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2272,6 +2326,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2352,10 +2408,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2464,10 +2522,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2484,6 +2544,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2492,6 +2553,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2500,6 +2562,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2564,7 +2627,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2580,10 +2643,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2762,11 +2827,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2777,7 +2842,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2802,6 +2867,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2814,10 +2880,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2834,6 +2902,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2842,6 +2911,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2850,6 +2920,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2858,6 +2929,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2898,6 +2970,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2916,6 +2994,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2961,21 +3040,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3069,7 +3143,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3121,7 +3195,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3131,16 +3205,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3163,7 +3239,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3188,13 +3264,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3235,7 +3311,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3295,7 +3371,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3539,7 +3615,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3572,7 +3648,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3601,7 +3677,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3616,11 +3692,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3691,7 +3767,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3724,11 +3800,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3752,6 +3828,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3855,6 +3933,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3915,11 +3994,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3927,6 +4040,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3937,7 +4054,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4049,7 +4170,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4167,7 +4288,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4249,7 +4370,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4307,7 +4428,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4351,35 +4472,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4437,7 +4558,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4626,7 +4747,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4784,7 +4905,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4955,7 +5076,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5072,6 +5193,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/or.po b/po/or.po
index 79305a246..0d60bafe0 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index b34307a58..6fedee0dc 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -495,6 +495,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -679,25 +681,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -835,10 +837,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -863,6 +867,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -891,6 +896,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -954,6 +960,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -970,11 +977,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1024,11 +1031,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1044,10 +1051,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1064,11 +1073,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1080,6 +1089,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1092,11 +1102,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1104,10 +1115,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1136,10 +1148,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1259,6 +1273,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1360,7 +1375,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1373,26 +1388,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1431,7 +1454,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1527,6 +1550,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1567,10 +1591,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1646,6 +1671,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1714,6 +1740,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1778,7 +1805,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1801,7 +1828,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1887,19 +1914,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1962,6 +1995,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1970,6 +2009,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1978,6 +2018,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1986,6 +2027,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1994,6 +2036,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2034,6 +2077,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2215,18 +2259,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2241,6 +2289,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2257,12 +2306,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2271,6 +2325,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2351,10 +2407,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2463,10 +2521,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2483,6 +2543,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2491,6 +2552,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2499,6 +2561,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2563,7 +2626,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2579,10 +2642,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2761,11 +2826,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2776,7 +2841,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2801,6 +2866,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2813,10 +2879,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2833,6 +2901,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2841,6 +2910,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2849,6 +2919,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2857,6 +2928,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2897,6 +2969,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2915,6 +2993,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2960,21 +3039,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3068,7 +3142,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3120,7 +3194,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3130,16 +3204,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3162,7 +3238,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3187,13 +3263,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3234,7 +3310,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3294,7 +3370,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3538,7 +3614,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3571,7 +3647,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3600,7 +3676,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3615,11 +3691,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3690,7 +3766,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3723,11 +3799,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3751,6 +3827,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3854,6 +3932,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3914,11 +3993,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3926,6 +4039,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3936,7 +4053,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4048,7 +4169,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4166,7 +4287,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4248,7 +4369,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4306,7 +4427,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4350,35 +4471,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4436,7 +4557,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4625,7 +4746,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4783,7 +4904,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4954,7 +5075,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5071,6 +5192,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 8c03b12ef..ba558dc35 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2016-09-14 05:28+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -222,7 +222,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -499,6 +499,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -683,25 +685,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -839,10 +841,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -867,6 +871,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -895,6 +900,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -958,6 +964,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -974,11 +981,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1028,11 +1035,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1048,10 +1055,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1068,11 +1077,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1084,6 +1093,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1096,11 +1106,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1108,10 +1119,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1140,10 +1152,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1263,6 +1277,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1364,7 +1379,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1377,26 +1392,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1435,7 +1458,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1531,6 +1554,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1571,10 +1595,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1650,6 +1675,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1718,6 +1744,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1782,7 +1809,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1805,7 +1832,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1891,19 +1918,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1966,6 +1999,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1974,6 +2013,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1982,6 +2022,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1990,6 +2031,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1998,6 +2040,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2038,6 +2081,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2219,18 +2263,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2245,6 +2293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2261,12 +2310,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2275,6 +2329,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2355,10 +2411,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2467,10 +2525,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2487,6 +2547,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2495,6 +2556,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2503,6 +2565,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2567,7 +2630,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2583,10 +2646,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2765,11 +2830,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2780,7 +2845,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2805,6 +2870,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2817,10 +2883,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2837,6 +2905,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2845,6 +2914,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2853,6 +2923,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2861,6 +2932,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2901,6 +2973,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2919,6 +2997,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2964,21 +3043,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3072,7 +3146,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3124,7 +3198,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3134,16 +3208,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3166,7 +3242,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3191,13 +3267,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3238,7 +3314,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3298,7 +3374,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3542,7 +3618,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3575,7 +3651,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3604,7 +3680,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3619,11 +3695,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3694,7 +3770,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3727,11 +3803,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3755,6 +3831,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3858,6 +3936,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3918,11 +3997,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3930,6 +4043,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3940,7 +4057,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4052,7 +4173,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4170,7 +4291,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4252,7 +4373,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4310,7 +4431,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4354,35 +4475,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4440,7 +4561,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4629,7 +4750,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4789,7 +4910,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4960,7 +5081,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5077,6 +5198,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index d2e6e5c10..ec0d04957 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/libguestfs/"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -495,6 +495,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -679,25 +681,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -835,10 +837,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -863,6 +867,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -891,6 +896,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -954,6 +960,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -970,11 +977,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1024,11 +1031,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1044,10 +1051,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1064,11 +1073,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1080,6 +1089,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1092,11 +1102,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1104,10 +1115,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1136,10 +1148,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1259,6 +1273,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1360,7 +1375,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1373,26 +1388,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1431,7 +1454,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1527,6 +1550,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1567,10 +1591,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1646,6 +1671,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1714,6 +1740,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1778,7 +1805,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1801,7 +1828,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1887,19 +1914,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1962,6 +1995,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1970,6 +2009,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1978,6 +2018,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1986,6 +2027,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1994,6 +2036,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2034,6 +2077,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2215,18 +2259,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2241,6 +2289,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2257,12 +2306,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2271,6 +2325,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2351,10 +2407,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2463,10 +2521,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2483,6 +2543,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2491,6 +2552,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2499,6 +2561,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2563,7 +2626,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2579,10 +2642,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2761,11 +2826,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2776,7 +2841,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2801,6 +2866,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2813,10 +2879,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2833,6 +2901,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2841,6 +2910,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2849,6 +2919,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2857,6 +2928,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2897,6 +2969,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2915,6 +2993,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2960,21 +3039,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3068,7 +3142,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3120,7 +3194,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3130,16 +3204,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3162,7 +3238,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3187,13 +3263,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3234,7 +3310,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3294,7 +3370,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3538,7 +3614,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3571,7 +3647,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3600,7 +3676,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3615,11 +3691,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3690,7 +3766,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3723,11 +3799,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3751,6 +3827,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3854,6 +3932,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3914,11 +3993,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3926,6 +4039,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3936,7 +4053,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4048,7 +4169,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4166,7 +4287,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4248,7 +4369,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4306,7 +4427,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4350,35 +4471,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4436,7 +4557,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4625,7 +4746,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4785,7 +4906,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4956,7 +5077,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5073,6 +5194,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 77c262c27..fc96267dc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 6e5831b86..0217c1af1 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4782,7 +4903,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4953,7 +5074,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5070,6 +5191,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 87ffd13ca..a0fc4aac1 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -216,7 +216,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -493,6 +493,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -677,25 +679,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -833,10 +835,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -861,6 +865,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -889,6 +894,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -952,6 +958,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -968,11 +975,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1022,11 +1029,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1042,10 +1049,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1062,11 +1071,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1078,6 +1087,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1090,11 +1100,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1102,10 +1113,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1134,10 +1146,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1257,6 +1271,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1358,7 +1373,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1371,26 +1386,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1429,7 +1452,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1525,6 +1548,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1565,10 +1589,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1644,6 +1669,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1712,6 +1738,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1776,7 +1803,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1799,7 +1826,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1885,19 +1912,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1960,6 +1993,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1968,6 +2007,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1976,6 +2016,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1984,6 +2025,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1992,6 +2034,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2032,6 +2075,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2213,18 +2257,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2239,6 +2287,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2255,12 +2304,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2269,6 +2323,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2349,10 +2405,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2461,10 +2519,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2481,6 +2541,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2489,6 +2550,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2497,6 +2559,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2561,7 +2624,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2577,10 +2640,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2759,11 +2824,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2774,7 +2839,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2799,6 +2864,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2811,10 +2877,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2831,6 +2899,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2839,6 +2908,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2847,6 +2917,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2855,6 +2926,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2895,6 +2967,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2913,6 +2991,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2958,21 +3037,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3066,7 +3140,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3118,7 +3192,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3128,16 +3202,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3160,7 +3236,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3185,13 +3261,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3232,7 +3308,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3292,7 +3368,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3536,7 +3612,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3569,7 +3645,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3598,7 +3674,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3613,11 +3689,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3688,7 +3764,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3721,11 +3797,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3749,6 +3825,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3852,6 +3930,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3912,11 +3991,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3924,6 +4037,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3934,7 +4051,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4046,7 +4167,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4164,7 +4285,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4246,7 +4367,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4304,7 +4425,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4348,35 +4469,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4434,7 +4555,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4623,7 +4744,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4781,7 +4902,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4952,7 +5073,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5069,6 +5190,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index a72854fcb..281d2a307 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2018-02-07 09:57+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -223,7 +223,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -500,6 +500,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -684,25 +686,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -840,10 +842,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -868,6 +872,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -896,6 +901,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -959,6 +965,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -975,11 +982,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1029,11 +1036,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1049,10 +1056,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1069,11 +1078,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1085,6 +1094,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1097,11 +1107,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1109,10 +1120,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1141,10 +1153,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1264,6 +1278,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1365,7 +1380,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1378,26 +1393,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1436,7 +1459,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1532,6 +1555,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1572,10 +1596,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1651,6 +1676,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1719,6 +1745,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1783,7 +1810,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1806,7 +1833,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1892,19 +1919,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1967,6 +2000,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1975,6 +2014,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1983,6 +2023,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1991,6 +2032,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1999,6 +2041,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2039,6 +2082,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2220,18 +2264,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2246,6 +2294,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2262,12 +2311,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2276,6 +2330,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2356,10 +2412,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2468,10 +2526,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2488,6 +2548,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2496,6 +2557,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2504,6 +2566,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2568,7 +2631,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2584,10 +2647,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2766,11 +2831,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2781,7 +2846,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2806,6 +2871,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2818,10 +2884,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2838,6 +2906,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2846,6 +2915,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2854,6 +2924,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2862,6 +2933,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2902,6 +2974,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2920,6 +2998,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2965,21 +3044,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3081,7 +3155,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3133,7 +3207,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3143,16 +3217,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3175,7 +3251,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3200,13 +3276,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3247,7 +3323,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3307,7 +3383,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3551,7 +3627,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3584,7 +3660,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3613,7 +3689,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3628,11 +3704,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3703,7 +3779,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3736,11 +3812,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3764,6 +3840,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3869,6 +3947,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3929,11 +4008,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3941,6 +4054,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3951,7 +4068,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4063,7 +4184,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4181,7 +4302,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4263,7 +4384,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4321,7 +4442,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4365,35 +4486,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4451,7 +4572,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4640,7 +4761,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4800,7 +4921,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4971,7 +5092,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5088,6 +5209,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 985a01e38..701ea5f16 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2019-10-09 19:12+0100\n"
+"POT-Creation-Date: 2019-10-15 12:57+0100\n"
 "PO-Revision-Date: 2015-02-21 10:55+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -217,7 +217,7 @@ msgstr ""
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:371
+#: ../v2v/windows_virtio.ml:378
 msgid "%s: cannot open virtio-win ISO file: %s"
 msgstr ""
 
@@ -494,6 +494,8 @@ msgstr ""
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:331
+#. ../common/mlcustomize/customize_cmdline.ml:240
 #: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
@@ -678,25 +680,25 @@ msgstr ""
 msgid "-o json: unknown output option ‘-oo %s’"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:136
+#: ../v2v/output_libvirt.ml:131
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/name element.  See virt-v2v-"
 "output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:126
+#: ../v2v/output_libvirt.ml:121
 msgid ""
 "-o libvirt: output pool ‘%s’ does not have /pool/target/path element.  See "
 "virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:128
+#: ../v2v/output_libvirt.ml:123
 msgid ""
 "-o libvirt: output pool ‘%s’ has type='dir' but the /pool/target/path "
 "element is not a local directory.  See virt-v2v-output-local(1)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:122
+#: ../v2v/output_libvirt.ml:117
 msgid ""
 "-o libvirt: output pool ‘%s’ is not a directory (type='dir').  See virt-v2v-"
 "output-local(1)"
@@ -834,10 +836,12 @@ msgstr ""
 msgid "Add new a elements location"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:269
 #: ../customize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:252
 #: ../customize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
@@ -862,6 +866,7 @@ msgstr ""
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:168
 #: ../customize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
@@ -890,6 +895,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:349
 #: ../customize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
@@ -953,6 +959,7 @@ msgstr ""
 msgid "Change filesystem UUIDs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:179
 #: ../customize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
@@ -969,11 +976,11 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:380
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
-#: ../v2v/v2v.ml:642
+#: ../v2v/v2v.ml:641
 msgid "Checking if the guest needs BIOS or UEFI to boot"
 msgstr ""
 
@@ -1023,11 +1030,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:559
+#: ../v2v/v2v.ml:558
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:557
+#: ../v2v/v2v.ml:556
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -1043,10 +1050,12 @@ msgstr ""
 msgid "Converting to qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:201
 #: ../customize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:212
 #: ../customize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
@@ -1063,11 +1072,11 @@ msgstr ""
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:686
+#: ../v2v/v2v.ml:685
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:689
+#: ../v2v/v2v.ml:688
 msgid "Copying disk %d/%d to qemu URI %s (%s)"
 msgstr ""
 
@@ -1079,6 +1088,7 @@ msgstr ""
 msgid "Copying: %s to %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:286
 #: ../customize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
@@ -1091,11 +1101,12 @@ msgstr ""
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:280
 #: ../customize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:285
+#: ../v2v/v2v.ml:284
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
@@ -1103,10 +1114,11 @@ msgstr ""
 msgid "Creating index backup copy"
 msgstr ""
 
-#: ../v2v/v2v.ml:188
+#: ../v2v/v2v.ml:187
 msgid "Creating output metadata"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:474
 #: ../customize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
@@ -1135,10 +1147,12 @@ msgid ""
 "for installing packages, editing files and so on."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:285
 #: ../customize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:218
 #: ../customize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
@@ -1258,6 +1272,7 @@ msgid ""
 "that contains the main operating system from the list below:\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:229
 #: ../customize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
@@ -1359,7 +1374,7 @@ msgstr ""
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../v2v/output_rhv.ml:157
+#: ../v2v/output_rhv.ml:156
 msgid "Export Storage Domain"
 msgstr ""
 
@@ -1372,26 +1387,34 @@ msgid "Extracting data out of the image"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:337
+#. ../common/mlcustomize/customize_cmdline.ml:402
+#. ../common/mlcustomize/customize_cmdline.ml:384
+#. ../common/mlcustomize/customize_cmdline.ml:337
 #: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:437
 #: ../customize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:426
 #: ../customize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:224
 #: ../customize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:163
 #: ../customize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:185
 #: ../customize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
@@ -1430,7 +1453,7 @@ msgstr ""
 
 #. ../customize/customize_main.ml:198
 #. ../builder/builder.ml:768
-#: ../v2v/v2v.ml:197 ../v2v/copy_to_local.ml:231
+#: ../v2v/v2v.ml:196 ../v2v/copy_to_local.ml:231
 msgid "Finishing off"
 msgstr ""
 
@@ -1526,6 +1549,7 @@ msgstr ""
 msgid "Get kernel from image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:257
 #: ../customize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
@@ -1566,10 +1590,11 @@ msgstr ""
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:170
 msgid "Initializing the target %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:379
 #: ../customize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
@@ -1645,6 +1670,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:207
 #: ../customize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
@@ -1713,6 +1739,7 @@ msgstr ""
 msgid "Mount point on host"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:297
 #: ../customize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
@@ -1777,7 +1804,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../customize/firstboot.ml:253
+#: ../common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
@@ -1800,7 +1827,7 @@ msgstr ""
 msgid "Opening the overlay"
 msgstr ""
 
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:199
 msgid "Opening the source %s"
 msgstr ""
 
@@ -1886,19 +1913,25 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/v2v.ml:818
+#: ../v2v/v2v.ml:817
 msgid "Overlay saved as %s [--debug-overlays]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:390
+#. ../common/mlcustomize/customize_cmdline.ml:217
 #: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:174
 #: ../customize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:247
+#. ../common/mlcustomize/customize_cmdline.ml:409
+#. ../common/mlcustomize/customize_cmdline.ml:264
+#. ../common/mlcustomize/customize_cmdline.ml:247
 #: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
@@ -1961,6 +1994,12 @@ msgstr ""
 msgid "Print source and stop"
 msgstr ""
 
+#: ../v2v/convert_windows.ml:301
+msgid ""
+"QEMU Guest Agent MSI not found on tools ISO/directory. You may want to "
+"install the guest agent manually after conversion."
+msgstr ""
+
 #: ../v2v/windows_virtio.ml:223
 msgid "QEMU Guest Agent installed for this guest."
 msgstr ""
@@ -1969,6 +2008,7 @@ msgstr ""
 msgid "RHV does not support the output format ‘%s’, only raw or qcow2"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:190
 #: ../customize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
@@ -1977,6 +2017,7 @@ msgstr ""
 msgid "Read passphrases from stdin"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:391
 #: ../customize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
@@ -1985,6 +2026,7 @@ msgstr ""
 msgid "Recursively truncating: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:355
 #: ../customize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
@@ -1993,6 +2035,7 @@ msgstr ""
 msgid "Registering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:464
 #: ../customize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
@@ -2033,6 +2076,7 @@ msgstr ""
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:361
 #: ../customize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
@@ -2214,18 +2258,22 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:241
 #: ../customize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:332
 #: ../customize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:235
 #: ../customize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:326
 #: ../customize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
@@ -2240,6 +2288,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:403
 #: ../customize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
@@ -2256,12 +2305,17 @@ msgstr ""
 msgid "Running: %s/%s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:325
+#. ../common/mlcustomize/customize_cmdline.ml:234
 #: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
 #. ../customize/customize_cmdline.ml:315
 #. ../common/mltools/tools_utils.ml:356
+#. ../common/mlcustomize/customize_cmdline.ml:470
+#. ../common/mlcustomize/customize_cmdline.ml:344
+#. ../common/mlcustomize/customize_cmdline.ml:315
 #: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
@@ -2270,6 +2324,8 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:292
+#. ../common/mlcustomize/customize_cmdline.ml:196
 #: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
@@ -2350,10 +2406,12 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:338
 #: ../customize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:448
 #: ../customize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
@@ -2462,10 +2520,12 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:458
 #: ../customize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:320
 #: ../customize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
@@ -2482,6 +2542,7 @@ msgstr ""
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:397
 #: ../customize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
@@ -2490,6 +2551,7 @@ msgstr ""
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:258
 #: ../customize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
@@ -2498,6 +2560,7 @@ msgstr ""
 msgid "Set the output architecture"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:309
 #: ../customize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
@@ -2562,7 +2625,7 @@ msgstr ""
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:205
 msgid "Source guest information (--print-source option):\n"
 msgstr ""
 
@@ -2578,10 +2641,12 @@ msgstr ""
 msgid "Specify a LUKS key"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:275
 #: ../customize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:396
 #: ../customize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
@@ -2760,11 +2825,11 @@ msgid ""
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:580
+#: ../v2v/v2v.ml:579
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:578
+#: ../v2v/v2v.ml:577
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2775,7 +2840,7 @@ msgid ""
 "require a separate password to connect."
 msgstr ""
 
-#: ../v2v/v2v.ml:663
+#: ../v2v/v2v.ml:662
 msgid "This guest requires UEFI on the target to boot."
 msgstr ""
 
@@ -2800,6 +2865,7 @@ msgstr ""
 msgid "Trimming %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:385
 #: ../customize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
@@ -2812,10 +2878,12 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:303
 #: ../customize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:373
 #: ../customize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
@@ -2832,6 +2900,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:414
 #: ../customize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
@@ -2840,6 +2909,7 @@ msgstr ""
 msgid "Uninstalling packages: %s"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:367
 #: ../customize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
@@ -2848,6 +2918,7 @@ msgstr ""
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:420
 #: ../customize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
@@ -2856,6 +2927,7 @@ msgstr ""
 msgid "Updating packages"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:431
 #: ../customize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
@@ -2896,6 +2968,12 @@ msgstr ""
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:212
+msgid ""
+"VDDK library path %s not found or not a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
@@ -2914,6 +2992,7 @@ msgid ""
 "error message was: %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:442
 #: ../customize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
@@ -2959,21 +3038,16 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:103
-msgid ""
-"a libvirt domain called ‘%s’ already exists on the target.\n"
-"\n"
-"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
-"delete the existing domain on the target using the ‘virsh undefine’ command."
-msgstr ""
-
-#: ../v2v/output_libvirt.ml:106
+#: ../v2v/output_libvirt.ml:102
 msgid ""
 "a libvirt domain called ‘%s’ already exists on the target.\n"
 "\n"
 "If using virt-v2v directly, use the ‘-on’ option to select a different name. "
 "Or delete the existing domain on the target using the ‘virsh undefine’ "
-"command."
+"command.\n"
+"\n"
+"If using virt-p2v, select a different ‘Name’ in the ‘Target properties’. Or "
+"delete the existing domain on the target using the ‘virsh undefine’ command."
 msgstr ""
 
 #: ../resize/resize.ml:255
@@ -3067,7 +3141,7 @@ msgid ""
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../customize/firstboot.ml:235
+#: ../common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
@@ -3119,7 +3193,7 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:172
+#: ../v2v/output_rhv.ml:171
 msgid ""
 "cannot write files to the NFS server as %d:%d, even though we appear to be "
 "running as root. This probably means the NFS client or idmapd is not "
@@ -3129,16 +3203,18 @@ msgid ""
 "otherwise RHV-M will not be able to import the VM."
 msgstr ""
 
-#: ../v2v/output_rhv.ml:174
+#: ../v2v/output_rhv.ml:173
 msgid ""
 "cannot write files to the NFS server as %d:%d. You might want to stop virt-"
 "v2v (^C) and rerun it as root."
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:493
 #: ../customize/customize_cmdline.ml:493
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:510
 #: ../customize/customize_cmdline.ml:510
 msgid "command '%s' not valid, see the man page"
 msgstr ""
@@ -3161,7 +3237,7 @@ msgid ""
 "messages"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:206
+#: ../v2v/output_libvirt.ml:201
 msgid ""
 "could not define libvirt domain: %s.\n"
 "The libvirt XML is still available in ‘%s’.  Try running ‘virsh -c %s define "
@@ -3186,13 +3262,13 @@ msgstr ""
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:606
+#: ../v2v/convert_windows.ml:625
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 msgstr ""
 
-#: ../customize/firstboot.ml:232
+#: ../common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
@@ -3233,7 +3309,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:168
+#: ../v2v/output_libvirt.ml:163
 msgid "could not refresh libvirt pool ‘%s’: %s"
 msgstr ""
 
@@ -3293,7 +3369,7 @@ msgstr ""
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../v2v/v2v.ml:602
+#: ../v2v/v2v.ml:601
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -3537,7 +3613,7 @@ msgstr ""
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../customize/firstboot.ml:144
+#: ../common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
@@ -3570,7 +3646,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:432
 msgid ""
 "fstrim on guest filesystem %s failed.  Usually you can ignore this message.  "
 "To find out more read \"Trimming\" in virt-v2v(1).\n"
@@ -3599,7 +3675,7 @@ msgstr ""
 msgid "glance: image upload to glance failed, see earlier errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:318
 msgid ""
 "guest disk %s appears to be zero bytes in size.\n"
 "\n"
@@ -3614,11 +3690,11 @@ msgid ""
 "workaround."
 msgstr ""
 
-#: ../customize/firstboot.ml:164
+#: ../common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../customize/firstboot.ml:367
+#: ../common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
@@ -3689,7 +3765,7 @@ msgid ""
 "No root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:279
 msgid ""
 "insufficient free space in the conversion server temporary directory %s "
 "(%s).\n"
@@ -3722,11 +3798,11 @@ msgstr ""
 msgid "internal error: is_file_owned: unexpected output from dpkg command: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:703
+#: ../v2v/v2v.ml:702
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:308
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -3750,6 +3826,8 @@ msgstr ""
 msgid "invalid cpuid.coresPerSocket < number of vCPUs"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:154
+#. ../common/mlcustomize/customize_cmdline.ml:143
 #: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
@@ -3853,6 +3931,7 @@ msgstr ""
 msgid "manifest has a checksum for non-existent file %s (ignored)"
 msgstr ""
 
+#. ../common/mlcustomize/customize_cmdline.ml:454
 #: ../customize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
@@ -3913,11 +3992,45 @@ msgid ""
 "See also the virt-v2v-output-rhv(1) manual."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:396
+#: ../v2v/nbdkit.ml:68
+msgid ""
+"nbdkit --dump-config did not print version.  This might be a very old or "
+"broken nbdkit binary."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:73
+msgid "nbdkit --dump-config: could not parse version: %s"
+msgstr ""
+
+#: ../v2v/nbdkit.ml:240
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"It looks like you did not set the right path in the ‘-io vddk-libdir’ "
+"option, or your copy of the VDDK directory is incomplete.  There should be a "
+"library called ’<libdir>/%s/libvixDiskLib.so.?’.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/nbdkit.ml:234
+msgid ""
+"nbdkit VDDK plugin is not installed or not working.  It is required if you "
+"want to use VDDK.\n"
+"\n"
+"The VDDK plugin is not enabled by default when you compile nbdkit.  You have "
+"to read the instructions in the nbdkit sources under ‘plugins/vddk/README."
+"VDDK’ to find out how to enable the VDDK plugin.\n"
+"\n"
+"See also the virt-v2v-input-vmware(1) manual."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:396 ../v2v/nbdkit.ml:377
 msgid "nbdkit did not start up.  See previous debugging messages for problems."
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:398
+#: ../v2v/output_rhv_upload.ml:398 ../v2v/nbdkit.ml:379
 msgid ""
 "nbdkit did not start up.  There may be errors printed by nbdkit above.\n"
 "\n"
@@ -3925,6 +4038,10 @@ msgid ""
 "the ‘virt-v2v -v -x’ options and examine the debugging output carefully."
 msgstr ""
 
+#: ../v2v/nbdkit.ml:58
+msgid "nbdkit is not installed or not working"
+msgstr ""
+
 #: ../v2v/output_rhv_upload.ml:134
 msgid ""
 "nbdkit is not installed or not working.  It is required to use ‘-o rhv-"
@@ -3935,7 +4052,11 @@ msgstr ""
 msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16"
 msgstr ""
 
-#: ../v2v/output_rhv_upload.ml:174
+#: ../v2v/nbdkit.ml:76
+msgid "nbdkit is too old.  nbdkit >= %s is required."
+msgstr ""
+
+#: ../v2v/output_rhv_upload.ml:174 ../v2v/nbdkit.ml:86
 msgid ""
 "nbdkit was compiled without SELinux support.  You will have to recompile "
 "nbdkit with libselinux-devel installed, or else set SELinux to Permissive "
@@ -4047,7 +4168,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:408
 msgid ""
 "not enough free space for conversion on filesystem ‘%s’.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -4165,7 +4286,7 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:612
+#: ../v2v/v2v.ml:611
 msgid ""
 "output format should be ‘raw’ or ‘qcow2’.\n"
 "\n"
@@ -4247,7 +4368,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:748 ../v2v/v2v.ml:305
+#: ../v2v/v2v.ml:747 ../v2v/v2v.ml:304
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -4305,7 +4426,7 @@ msgstr ""
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
-#: ../v2v/windows_virtio.ml:303
+#: ../v2v/windows_virtio.ml:309 ../v2v/windows_virtio.ml:303
 msgid ""
 "root directory ‘/’ is missing from the virtio-win directory or ISO.\n"
 "\n"
@@ -4349,35 +4470,35 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:829
+#: ../v2v/v2v.ml:828
 msgid "source has multiple hard disk types!"
 msgstr ""
 
-#: ../v2v/v2v.ml:845
+#: ../v2v/v2v.ml:844
 msgid "source has multiple network adapter model!"
 msgstr ""
 
-#: ../v2v/v2v.ml:827 ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:826 ../v2v/v2v.ml:239
 msgid "source has no hard disks!"
 msgstr ""
 
-#: ../v2v/v2v.ml:837
+#: ../v2v/v2v.ml:836
 msgid "source has unrecognized hard disk type"
 msgstr ""
 
-#: ../v2v/v2v.ml:835
+#: ../v2v/v2v.ml:834
 msgid "source has unsupported hard disk type ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:851
+#: ../v2v/v2v.ml:850
 msgid "source has unsupported network adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:859
+#: ../v2v/v2v.ml:858
 msgid "source has unsupported video adapter model ‘%s’"
 msgstr ""
 
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:234
 msgid ""
 "source sockets * cores * threads <> number of vCPUs.\n"
 "Sockets %d * cores per socket %d * threads %d = %d, but number of vCPUs = "
@@ -4435,7 +4556,7 @@ msgstr ""
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../v2v/v2v.ml:616
+#: ../v2v/v2v.ml:615
 msgid ""
 "the --compressed flag is only allowed when the output format is qcow2 (-of "
 "qcow2)"
@@ -4624,7 +4745,7 @@ msgid ""
 "specify the UUIDs of guest disk images (for this guest: %d)"
 msgstr ""
 
-#: ../v2v/v2v.ml:654
+#: ../v2v/v2v.ml:653
 msgid ""
 "this guest cannot run on the target, because the target does not support %s "
 "firmware (supported firmware on target: %s)"
@@ -4780,7 +4901,7 @@ msgstr ""
 msgid "unknown sound model %s ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:215
 msgid "unknown source hypervisor (‘%s’) in metadata"
 msgstr ""
 
@@ -4951,7 +5072,7 @@ msgid ""
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:565
+#: ../v2v/v2v.ml:564
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -5068,6 +5189,12 @@ msgstr ""
 msgid "‘-ic %s’ URL does not contain a host name field"
 msgstr ""
 
+#: ../v2v/nbdkit.ml:205
+msgid ""
+"‘-io vddk-libdir=%s’ does not point to a directory.  See the virt-v2v-input-"
+"vmware(1) manual."
+msgstr ""
+
 #: ../builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""