[Pkg-libvirt-commits] [libguestfs] 14/17: Version 1.27.55.

[Hilko Bengen]

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

bengen pushed a commit to annotated tag debian/1%1.27.55-1
in repository libguestfs.

commit 7ebab447935a3b4045470eff8bc880d34d584f03
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Sep 26 17:14:19 2014 +0100

    Version 1.27.55.
---
 BUGS                        |  39 ++-
 configure.ac                |   2 +-
 po-docs/ja.po               | 613 ++++++++++++++++++++++++--------------------
 po-docs/libguestfs-docs.pot | 599 +++++++++++++++++++++++--------------------
 po-docs/uk.po               | 611 +++++++++++++++++++++++--------------------
 po/en_GB.po                 | 210 ++++++++-------
 po/es.po                    | 210 ++++++++-------
 po/gu.po                    | 210 ++++++++-------
 po/hi.po                    | 210 ++++++++-------
 po/kn.po                    | 210 ++++++++-------
 po/libguestfs.pot           | 212 ++++++++-------
 po/ml.po                    | 210 ++++++++-------
 po/mr.po                    | 210 ++++++++-------
 po/nl.po                    | 210 ++++++++-------
 po/or.po                    | 210 ++++++++-------
 po/pa.po                    | 210 ++++++++-------
 po/pl.po                    | 210 ++++++++-------
 po/ta.po                    | 210 ++++++++-------
 po/te.po                    | 210 ++++++++-------
 po/uk.po                    | 210 ++++++++-------
 20 files changed, 2741 insertions(+), 2275 deletions(-)

diff --git a/BUGS b/BUGS
index da2b56b..ec40b5f 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-09-24
+Last updated: 2014-09-26
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -419,21 +419,27 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1145583 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1145583
   xen kernel should be removed from boot menu after conversion by virt-v2v
 
-1145908 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1145908
-  No virtio drivers available warning shows when converting win8 guest
-
-1145916 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1145916
-  virt-v2v fails to convert win7 guest
-
-1145995 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1145995
-  Improve the error info when converting windows guest with unclean file system
-
 1146007 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146007
   Input/output error during conversion of esx guest.
 
 1146017 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146017
   virt-v2v -v -x during windows guest conversion will hang at hivex: hivex_open: used block id ??
 
+1146275 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146275
+  regression setting root password with virt-builder/virt-customize
+
+1146339 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146339
+  Improve the error showing when no enough space left on host while conversion
+
+1146477 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146477
+  virt-v2v sometimes hangs with printing: Add. Sense: No additional sense information
+
+1146815 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146815
+  virt-v2v prints warning: /files/etc/fstab/8/spec references unknown device "cdrom"
+
+1146832 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146832
+  virt-v2v fail to convert guest with disk type volume
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -458,7 +464,13 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1142008 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1142008
   Conversion guest cannot been seen on rhevm server
 
-(146 bugs)
+1145908 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145908
+  No virtio drivers available warning shows when converting win8 guest
+
+1145916 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
+  virt-v2v fails to convert win7 guest
+
+(150 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -625,6 +637,9 @@ These bugs are in the VERIFIED state.
 1144766 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144766
   futimens() is a no-op via guestmount
 
-(32 bugs)
+1145995 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145995
+  Improve the error info when converting windows guest with unclean file system
+
+(33 bugs)
 
 End of BUGS file.
diff --git a/configure.ac b/configure.ac
index e96d6c7..37cbfb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [27])
-m4_define([libguestfs_release], [54])
+m4_define([libguestfs_release], [55])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 9a8f1dd..6d32fb5 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-23 16:53+0200\n"
+"POT-Creation-Date: 2014-09-26 17:11+0200\n"
 "PO-Revision-Date: 2014-07-22 18:04+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -723,7 +723,7 @@ msgstr ""
 #: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
 #: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:214
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:419
 msgid "B<-q>"
 msgstr "B<-q>"
 
@@ -731,7 +731,7 @@ msgstr "B<-q>"
 #: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
 #: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
 #: ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:397
+#: ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:421
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
@@ -781,7 +781,7 @@ msgstr ""
 #: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243
 #: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
 #: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:501
 msgid "B<-v>"
 msgstr "B<-v>"
 
@@ -796,7 +796,7 @@ msgstr "B<-v>"
 #: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245
 #: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
 #: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
-#: ../v2v/virt-v2v.pod:479
+#: ../v2v/virt-v2v.pod:503
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
@@ -808,7 +808,7 @@ msgstr "B<--verbose>"
 #: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
 #: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
 #: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:226
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:505
 msgid "Enable verbose messages for debugging."
 msgstr "デバッグ用の冗長なメッセージを有効にします。"
 
@@ -827,7 +827,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
 #: ../p2v/virt-p2v.pod:249 ../rescue/virt-rescue.pod:244
 #: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
 #: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:507
 msgid "B<-V>"
 msgstr "B<-V>"
 
@@ -847,7 +847,7 @@ msgstr "B<-V>"
 #: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
 #: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
 #: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:485
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:509
 msgid "B<--version>"
 msgstr "B<--version>"
 
@@ -863,7 +863,7 @@ msgstr "B<--version>"
 #: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
 #: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
 #: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:487
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:511
 msgid "Display version number and exit."
 msgstr "バージョン番号を表示して、終了します。"
 
@@ -878,7 +878,7 @@ msgstr "バージョン番号を表示して、終了します。"
 #: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
 #: ../resize/virt-resize.pod:593 ../sparsify/virt-sparsify.pod:304
 #: ../sysprep/virt-sysprep.pod:234 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:498
+#: ../v2v/virt-v2v.pod:522
 msgid "B<-x>"
 msgstr "B<-x>"
 
@@ -891,7 +891,7 @@ msgstr "B<-x>"
 #: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
 #: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595
 #: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:236
-#: ../v2v/virt-v2v.pod:500
+#: ../v2v/virt-v2v.pod:524
 msgid "Enable tracing of libguestfs API calls."
 msgstr "libguestfs API 呼び出しのトレースを有効にします。"
 
@@ -1401,9 +1401,9 @@ msgstr "このプログラムは以下を返します:"
 #: ../sysprep/virt-sysprep.pod:414 ../tools/virt-win-reg:194
 #: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
 #: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:457 ../v2v/virt-v2v.pod:461
-#: ../v2v/virt-v2v.pod:466 ../v2v/virt-v2v.pod:764 ../v2v/virt-v2v.pod:769
-#: ../v2v/virt-v2v.pod:774
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:481 ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:490 ../v2v/virt-v2v.pod:788 ../v2v/virt-v2v.pod:793
+#: ../v2v/virt-v2v.pod:798
 msgid "*"
 msgstr "*"
 
@@ -1485,7 +1485,7 @@ msgstr ""
 #: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4748
 #: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
 #: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1009
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1033
 msgid "SEE ALSO"
 msgstr "関連項目"
 
@@ -1525,7 +1525,7 @@ msgstr "著者"
 #: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
 #: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
 #: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1024
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1049
 msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 
@@ -1556,7 +1556,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4812
 #: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
 #: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1034
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1059
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
@@ -1886,7 +1886,7 @@ msgstr ""
 #: ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388
 #: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640
 #: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:946
+#: ../v2v/virt-v2v.pod:970
 msgid "ENVIRONMENT VARIABLES"
 msgstr "環境変数"
 
@@ -1925,7 +1925,7 @@ msgstr ""
 #: ../python/examples/guestfs-python.pod:65
 #: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4808
 #: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1022
+#: ../v2v/virt-v2v.pod:1047
 msgid "AUTHORS"
 msgstr "著者"
 
@@ -1956,7 +1956,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #: ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273
 #: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814
 #: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1036
+#: ../v2v/virt-v2v.pod:1061
 msgid "Copyright (C) 2009-2014 Red Hat Inc."
 msgstr ""
 
@@ -2793,13 +2793,13 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:221
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:227
 msgid "B<--machine-readable>"
 msgstr "B<--machine-readable>"
 
 #. type: textblock
 #: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:223
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:229
 msgid ""
 "This option is used to make the output more machine friendly when being "
 "parsed by other programs.  See L</MACHINE READABLE OUTPUT> below."
@@ -2897,8 +2897,8 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29
 #: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
 #: ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091
-#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:785
-#: ../v2v/virt-v2v.pod:908
+#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:809
+#: ../v2v/virt-v2v.pod:932
 msgid "1."
 msgstr "1."
 
@@ -2917,8 +2917,8 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42
 #: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
 #: ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095
-#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:799
-#: ../v2v/virt-v2v.pod:915
+#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:823
+#: ../v2v/virt-v2v.pod:939
 msgid "2."
 msgstr "2."
 
@@ -2936,8 +2936,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
 #: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
 #: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:807
-#: ../v2v/virt-v2v.pod:921
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:831
+#: ../v2v/virt-v2v.pod:945
 msgid "3."
 msgstr "3."
 
@@ -2952,7 +2952,7 @@ msgstr ""
 #. type: =item
 #: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
 #: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:828
+#: ../v2v/virt-v2v.pod:852
 msgid "4."
 msgstr "4."
 
@@ -5367,7 +5367,7 @@ msgstr ""
 
 #. type: =head1
 #: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:873
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:897
 msgid "MACHINE READABLE OUTPUT"
 msgstr "マシン可読な出力"
 
@@ -5402,7 +5402,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:894
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:918
 msgid ""
 "A list of features is printed, one per line, and the program exits with "
 "status 0."
@@ -5451,7 +5451,7 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:969
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:993
 msgid "C<VIRT_TOOLS_DATA_DIR>"
 msgstr ""
 
@@ -5465,7 +5465,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:974
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:998
 msgid ""
 "Normally you do not need to set this.  If not set, a compiled-in default "
 "will be used (something like C</usr/share/virt-tools>)."
@@ -5473,13 +5473,13 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:977
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1001
 msgid "This directory may contain the following files:"
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:981
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1005
 msgid "C<rhsrvany.exe>"
 msgstr ""
 
@@ -5494,7 +5494,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:988
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1012
 msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
 msgstr ""
 
@@ -8645,7 +8645,7 @@ msgstr ""
 
 #. type: textblock
 #: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1007
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1031
 msgid ""
 "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8785,7 +8785,7 @@ msgstr ""
 #: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
 #: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71
 #: ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:932
+#: ../v2v/virt-v2v.pod:956
 msgid "FILES"
 msgstr "ファイル"
 
@@ -53107,7 +53107,7 @@ msgstr ""
 "L<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1026
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1051
 msgid "Matthew Booth"
 msgstr ""
 
@@ -55185,7 +55185,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:879
+#: ../v2v/virt-v2v.pod:903
 msgid "There are two ways to use this option."
 msgstr "このオプションを使用するには 2 通りの方法があります。"
 
@@ -55218,7 +55218,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:901
+#: ../v2v/virt-v2v.pod:925
 msgid ""
 "Secondly use the option in conjunction with other options to make the "
 "regular program output more machine friendly."
@@ -55226,13 +55226,13 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:904
+#: ../v2v/virt-v2v.pod:928
 msgid "At the moment this means:"
 msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:910
+#: ../v2v/virt-v2v.pod:934
 msgid ""
 "Progress bar messages can be parsed from stdout by looking for this regular "
 "expression:"
@@ -55240,7 +55240,7 @@ msgstr ""
 
 #. type: verbatim
 #: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:913
+#: ../v2v/virt-v2v.pod:937
 #, no-wrap
 msgid ""
 " ^[0-9]+/[0-9]+$\n"
@@ -55251,7 +55251,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:917
+#: ../v2v/virt-v2v.pod:941
 msgid ""
 "The calling program should treat messages sent to stdout (except for "
 "progress bar messages) as status messages.  They can be logged and/or "
@@ -55957,7 +55957,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:399
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:423
 msgid "This disables progress bars and other unnecessary output."
 msgstr ""
 
@@ -56140,7 +56140,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:952
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:976
 msgid ""
 "Location of the temporary directory used for the potentially large temporary "
 "overlay file."
@@ -56154,7 +56154,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:955
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:979
 msgid ""
 "You should ensure there is enough free space in the worst case for a full "
 "copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -56162,7 +56162,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:959
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:983
 msgid "This defaults to C</tmp>."
 msgstr "この初期値は C</tmp> です。"
 
@@ -56177,7 +56177,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:967
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:991
 #, no-wrap
 msgid ""
 " mount -o remount,size=10G /tmp\n"
@@ -89503,17 +89503,31 @@ msgstr ""
 #. type: =item
 #: ../v2v/virt-v2v.pod:164
 #, fuzzy
+#| msgid "B<--debug>"
+msgid "B<--debug-overlays>"
+msgstr "B<--debug>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:166
+msgid ""
+"Save the overlay file(s) created during conversion.  This option is only "
+"used for debugging virt-v2v and may be removed in a future version."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:170
+#, fuzzy
 #| msgid "B<-i>"
 msgid "B<-i disk>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:172
 msgid "Set the input method to I<disk>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:174
 msgid ""
 "In this mode you can read a virtual machine disk image with no metadata.  "
 "virt-v2v tries to guess the best default metadata.  This is usually adequate "
@@ -89523,34 +89537,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
 msgid "B<-i libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:182
 msgid "Set the input method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:184
 msgid ""
 "In this mode you have to specify a libvirt guest name or UUID on the command "
 "line.  You may also specify a libvirt connection URI (see I<-ic>)."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:188
 msgid "B<-i libvirtxml>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
 msgid "Set the input method to I<libvirtxml>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
 msgid ""
 "In this mode you have to pass a libvirt XML file on the command line.  This "
 "file is read in order to get metadata about the source guest (such as its "
@@ -89559,33 +89573,33 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:197
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-i local>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:199
 #, fuzzy
 #| msgid "This is the same as the tune2fs C<-e> option."
 msgid "This is the same as I<-i disk>."
 msgstr "これは tune2fs C<-e> オプションと同じです。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:201
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-i ova>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:203
 msgid "Set the input method to I<ova>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:205
 msgid ""
 "In this mode you can read a VMware ova file.  Virt-v2v will read the ova "
 "manifest file and check the vmdk volumes for validity (checksums)  as well "
@@ -89593,19 +89607,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
 msgid "B<-ic> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:211
 msgid ""
 "Specify a libvirt connection URI to use when reading the guest.  This is "
 "only used when S<I<-i libvirt>>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:208
+#: ../v2v/virt-v2v.pod:214
 msgid ""
 "Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
 "connections can be used.  Other remote libvirt connections will not work in "
@@ -89613,7 +89627,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
 #, fuzzy
 #| msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
 msgid ""
@@ -89622,47 +89636,47 @@ msgid ""
 msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:221
 #, fuzzy
 #| msgid "B<--format>"
 msgid "B<-if> format"
 msgstr "B<--format>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
 msgid ""
 "For I<-i disk> only, this specifies the format of the input disk image.  For "
 "other input methods you should specify the input format in the metadata."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
 #, fuzzy
 #| msgid "B<--network>"
 msgid "B<--network> in:out"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:235
 #, fuzzy
 #| msgid "B<--network>"
 msgid "B<--network> out"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
 msgid "B<--bridge> in:out"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:239
 #, fuzzy
 #| msgid "B<--merge>"
 msgid "B<--bridge> out"
 msgstr "B<--merge>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:241
 msgid ""
 "Map network (or bridge) called C<in> to network (or bridge) called C<out>.  "
 "If no C<in:> prefix is given, all other networks (or bridges)  are mapped to "
@@ -89670,21 +89684,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:245
 #, fuzzy
 #| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
 msgid "See L</NETWORKS AND BRIDGES> below."
 msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:247
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "B<--no-copy>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:249
 msgid ""
 "Don't copy the disks.  Instead, conversion is performed (and thrown away), "
 "and metadata is written, but no disks are created.  See also discussion of "
@@ -89692,7 +89706,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
 msgid ""
 "This is useful in two cases: Either you want to test if conversion is likely "
 "to succeed, without the long copying process.  Or you are only interested in "
@@ -89700,40 +89714,79 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
 msgid ""
 "This option is not compatible with I<-o libvirt> since it would create a "
 "faulty guest (one with no disks)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:260
 msgid "This option is not compatible with I<-o glance> for technical reasons."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:262
+#, fuzzy
+#| msgid "B<--no-title>"
+msgid "B<--no-trim all>"
+msgstr "B<--no-title>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:264
+#, fuzzy
+#| msgid "B<--mount-options> mp:opts[;mp:opts;...]"
+msgid "B<--no-trim> mp[,mp...]"
+msgstr "B<--mount-options> mp:opts[;mp:opts;...]"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:266
+msgid ""
+"By default virt-v2v runs L<fstrim(8)> to reduce the amount of data that "
+"needs to be copied.  This is known to break some buggy bootloaders causing "
+"boot failures after conversion (see for example L<https://bugzilla.redhat."
+"com/show_bug.cgi?id=1141145#c27>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:271
+msgid ""
+"You can use I<--no-trim all> to disable all trimming.  Note this will "
+"greatly increase the amount of data that has to be copied and can make virt-"
+"v2v run much more slowly."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:275
+msgid ""
+"You can also disable trimming on selected filesystems only (specified by a "
+"comma-separated list of their mount point(s) in the guest).  Typically you "
+"would use I<--no-trim /boot> to work around the grub bug mentioned above."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:280
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-o disk>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:282
 #, fuzzy
 #| msgid "This is the same as the tune2fs C<-e> option."
 msgid "This is the same as I<-o local>."
 msgstr "これは tune2fs C<-e> オプションと同じです。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:284
 #, fuzzy
 #| msgid "B<-o kernel_cache>"
 msgid "B<-o glance>"
 msgstr "B<-o kernel_cache>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:286
 msgid ""
 "Set the output method to OpenStack Glance.  In this mode the converted guest "
 "is uploaded to Glance.  You can control the image name by setting the I<-on> "
@@ -89741,41 +89794,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:290
 msgid "B<-o libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:292
 msgid "Set the output method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:294
 msgid ""
 "In this mode, the converted guest is created as a libvirt guest.  You may "
 "also specify a libvirt connection URI (see I<-oc>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:297
 #, fuzzy
 #| msgid "see L</1 MB PARTITION ALIGNMENT> below."
 msgid "See L</OUTPUT TO LIBVIRT> below."
 msgstr "以下の L</1 MB パーティションアライメント> 参照。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:299
 msgid "B<-o local>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:301
 msgid "Set the output method to I<local>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:303
 msgid ""
 "In this mode, the converted guest is written to a local directory specified "
 "by I<-os /dir> (the directory must exist).  The converted guest's disks are "
@@ -89783,7 +89836,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
 #, no-wrap
 msgid ""
 " /dir/name-sda\n"
@@ -89793,12 +89846,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:311
 msgid "and a libvirt XML file is created containing guest metadata:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:313
 #, no-wrap
 msgid ""
 " /dir/name.xml\n"
@@ -89806,57 +89859,57 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:315
 msgid "where C<name> is the guest name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:317
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o null>"
 msgstr "B<-o option>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:319
 msgid "Set the output method to I<null>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:297
+#: ../v2v/virt-v2v.pod:321
 msgid ""
 "The guest is converted and copied (unless you also specify I<--no-copy>), "
 "but the results are thrown away and no metadata is written."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:325
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o ovirt>"
 msgstr "B<-o option>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
 #, fuzzy
 #| msgid "This is the same as the tune2fs C<-e> option."
 msgid "This is the same as I<-o rhev>."
 msgstr "これは tune2fs C<-e> オプションと同じです。"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:329
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o qemu>"
 msgstr "B<-o option>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:331
 msgid "Set the output method to I<qemu>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:333
 msgid ""
 "This is similar to I<-o local>, except that a shell script is written which "
 "you can use to boot the guest in qemu.  The converted disks and shell script "
@@ -89864,24 +89917,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:313
+#: ../v2v/virt-v2v.pod:337
 msgid ""
 "When using this output mode, you can also specify the I<--qemu-boot> option "
 "which boots the guest under qemu immediately."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:340
 msgid "B<-o rhev>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:342
 msgid "Set the output method to I<rhev>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:344
 msgid ""
 "The converted guest is written to a RHEV Export Storage Domain.  The I<-os> "
 "parameter must also be used to specify the location of the Export Storage "
@@ -89890,118 +89943,118 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:325
+#: ../v2v/virt-v2v.pod:349
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-o vdsm>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
 msgid "Set the output method to I<vdsm>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:353
 msgid ""
 "This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
 "runs virt-v2v under VDSM control."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
 msgid "B<-oa sparse>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
 msgid "B<-oa preallocated>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
 msgid "Set the output file allocation mode.  The default is C<sparse>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:362
 msgid "B<-oc> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
 msgid ""
 "Specify a libvirt connection to use when writing the converted guest.  This "
 "is only used when S<I<-o libvirt>>.  See L</OUTPUT TO LIBVIRT> below."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:367
 msgid ""
 "Only local libvirt connections can be used.  Remote libvirt connections will "
 "not work."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
 msgid "B<-of> format"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
 msgid "When converting the guest, convert the disks to the given format."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
 msgid "If not specified, then the input format is used."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
 msgid "B<-on> name"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:378
 msgid ""
 "Rename the guest when converting it.  If this option is not used then the "
 "output name is the same as the input name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
 msgid "B<-os> storage"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:359
+#: ../v2v/virt-v2v.pod:383
 msgid "The location of the storage for the converted guest."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:385
 msgid ""
 "For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
 "list>>) or pool UUID."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:388
 msgid ""
 "For I<-o local> and I<-o qemu>, this is a directory name.  The directory "
 "must exist."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:367
+#: ../v2v/virt-v2v.pod:391
 msgid ""
 "For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
 "form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:394
 #, no-wrap
 msgid ""
 " rhev-storage.example.com:/rhev/export\n"
@@ -90009,7 +90062,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:396
 msgid ""
 "The NFS export must be mountable and writable by the user and host running "
 "virt-v2v, since the virt-v2v program has to actually mount it when it runs.  "
@@ -90017,7 +90070,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:400
 msgid ""
 "B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
 "the mountpoint.  Note that virt-v2v will still need to write to this remote "
@@ -90025,21 +90078,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:405
 msgid ""
 "You will get an error if virt-v2v is unable to mount/write to the Export "
 "Storage Domain."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:408
 #, fuzzy
 #| msgid "B<--parts>"
 msgid "B<--print-source>"
 msgstr "B<--parts>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:410
 msgid ""
 "Print information about the source guest and stop.  This option is useful "
 "when you are setting up network and bridge maps.  See L</NETWORKS AND "
@@ -90047,51 +90100,51 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:414
 #, fuzzy
 #| msgid "B<--quiet>"
 msgid "B<--qemu-boot>"
 msgstr "B<--quiet>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:416
 msgid ""
 "When using I<-o qemu> only, this boots the guest immediately after virt-v2v "
 "finishes."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
 msgid "B<--root ask>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:427
 msgid "B<--root single>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:429
 msgid "B<--root first>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:431
 msgid "B<--root> /dev/sdX"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:433
 msgid "B<--root> /dev/VG/LV"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:435
 msgid "Choose the root filesystem to be converted."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
 msgid ""
 "In the case where the virtual machine is dual-boot or multi-boot, or where "
 "the VM has other filesystems that look like operating systems, this option "
@@ -90102,14 +90155,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:421
+#: ../v2v/virt-v2v.pod:445
 msgid ""
 "The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
 "virt-v2v to die if a multi-boot operating system is found."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:424
+#: ../v2v/virt-v2v.pod:448
 msgid ""
 "Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
 "found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -90118,7 +90171,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:453
 msgid ""
 "S<I<--root first>> means to choose the first root device in the case of a "
 "multi-boot operating system.  Since this is a heuristic, it may sometimes "
@@ -90126,7 +90179,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:457
 msgid ""
 "You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
 "mean to use the second partition on the first hard drive.  If the named root "
@@ -90135,7 +90188,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:462
 msgid ""
 "Note that there is a bug in grub which prevents it from successfully booting "
 "a multiboot system if VirtIO is enabled.  Grub is only able to boot an "
@@ -90145,28 +90198,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-image-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:470
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-vol-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-vm-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
 msgid ""
 "Normally the RHEV output mode chooses random UUIDs for the target guest.  "
 "However VDSM needs to control the UUIDs and passes these parameters when "
@@ -90174,48 +90227,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
 msgid "the image directory (I<--vdsm-image-uuid>)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:487
 msgid ""
 "UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
 "for each guest disk)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:492
 msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:496
 msgid ""
 "The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
 "digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:499
 msgid "These options can only be used with I<-o vdsm>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:513
 msgid "B<--vmtype desktop>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:491
+#: ../v2v/virt-v2v.pod:515
 #, fuzzy
 #| msgid "B<--merge>"
 msgid "B<--vmtype server>"
 msgstr "B<--merge>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:517
 msgid ""
 "For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest.  "
 "You can set this to C<desktop> or C<server>.  If the option is not given, "
@@ -90224,12 +90277,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:504
+#: ../v2v/virt-v2v.pod:528
 msgid "XEN PARAVIRTUALIZED GUESTS"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:530
 msgid ""
 "Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
 "a KVM guest by installing a new kernel.  This version of virt-v2v does "
@@ -90238,7 +90291,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:535
 msgid ""
 "Therefore before conversion you should check that a regular kernel is "
 "installed.  For some older Linux distributions, this means installing a "
@@ -90246,7 +90299,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:539
 #, no-wrap
 msgid ""
 " RHEL 3         (Does not apply, as there was no Xen PV kernel)\n"
@@ -90254,7 +90307,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:541
 #, no-wrap
 msgid ""
 " RHEL 4         i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -90267,7 +90320,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:548
 #, no-wrap
 msgid ""
 " RHEL 5         i686: install 'kernel-PAE'\n"
@@ -90276,7 +90329,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:527
+#: ../v2v/virt-v2v.pod:551
 #, no-wrap
 msgid ""
 " SLES 10        i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -90288,7 +90341,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:557
 #, no-wrap
 msgid ""
 " SLES 11+       i586: install 'kernel-pae'\n"
@@ -90297,7 +90350,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:560
 #, no-wrap
 msgid ""
 " Windows        (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -90305,19 +90358,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:562
 msgid "ENABLING VIRTIO"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:564
 msgid ""
 "\"Virtio\" is the name for a set of drivers which make disk (block device), "
 "network and other guest operations work much faster on KVM."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:567
 msgid ""
 "Older versions of virt-v2v could install these drivers for certain Linux "
 "guests.  This version of virt-v2v does I<not> attempt to install new Linux "
@@ -90325,7 +90378,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:548
+#: ../v2v/virt-v2v.pod:572
 msgid ""
 "In order to enable virtio, and hence improve performance of the guest after "
 "conversion, you should ensure that the B<minimum> versions of packages are "
@@ -90333,7 +90386,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:553
+#: ../v2v/virt-v2v.pod:577
 #, no-wrap
 msgid ""
 " RHEL 3         No virtio drivers are available\n"
@@ -90341,7 +90394,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:555
+#: ../v2v/virt-v2v.pod:579
 #, no-wrap
 msgid ""
 " RHEL 4         kernel >= 2.5.9-89.EL\n"
@@ -90349,7 +90402,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:581
 #, no-wrap
 msgid ""
 " RHEL 5         kernel >= 2.6.18-128.el5\n"
@@ -90359,7 +90412,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:585
 #, no-wrap
 msgid ""
 " RHEL 6+        All versions support virtio\n"
@@ -90367,7 +90420,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:587
 #, no-wrap
 msgid ""
 " Fedora         All versions support virtio\n"
@@ -90375,7 +90428,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:589
 #, no-wrap
 msgid ""
 " SLES 11+       All versions support virtio\n"
@@ -90383,7 +90436,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:591
 #, no-wrap
 msgid ""
 " SLES 10        kernel >= 2.6.16.60-0.85.1\n"
@@ -90391,7 +90444,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:593
 #, no-wrap
 msgid ""
 " OpenSUSE 11+   All versions support virtio\n"
@@ -90399,7 +90452,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:571
+#: ../v2v/virt-v2v.pod:595
 #, no-wrap
 msgid ""
 " OpenSUSE 10    kernel >= 2.6.25.5-1.1\n"
@@ -90407,7 +90460,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:597
 #, no-wrap
 msgid ""
 " Windows        Drivers are installed from /usr/share/virtio-win\n"
@@ -90416,12 +90469,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:576
+#: ../v2v/virt-v2v.pod:600
 msgid "NETWORKS AND BRIDGES"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:602
 msgid ""
 "Guests are usually connected to one or more networks, and when converted to "
 "the target hypervisor you usually want to reconnect those networks at the "
@@ -90429,7 +90482,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:607
 msgid ""
 "If you are unsure of what networks and bridges are in use on the source "
 "hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -90439,14 +90492,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:613
 msgid ""
 "In the I<--print-source> output you will see a section showing the guest's "
 "Network Interface Cards (NICs):"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:616
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -90457,21 +90510,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:597
+#: ../v2v/virt-v2v.pod:621
 msgid ""
 "This is typical of a libvirt guest: It has a single network interface "
 "connected to a network called C<default>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:624
 msgid ""
 "To map a specific network to a target network, for example C<default> on the "
 "source to C<rhevm> on the target, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:627
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network default:rhevm\n"
@@ -90479,12 +90532,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:629
 msgid "To map every network to a target network, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:631
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network rhevm\n"
@@ -90492,14 +90545,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:609
+#: ../v2v/virt-v2v.pod:633
 msgid ""
 "Bridges are handled in the same way, but you have to use the I<--bridge> "
 "option instead.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:612
+#: ../v2v/virt-v2v.pod:636
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -90510,7 +90563,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:617
+#: ../v2v/virt-v2v.pod:641
 #, no-wrap
 msgid ""
 " $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -90518,23 +90571,23 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:619
+#: ../v2v/virt-v2v.pod:643
 msgid "INPUT FROM VMWARE VCENTER SERVER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:621
+#: ../v2v/virt-v2v.pod:645
 msgid "Virt-v2v is able to import guests from VMware vCenter Server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:623
+#: ../v2v/virt-v2v.pod:647
 msgid ""
 "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:626
+#: ../v2v/virt-v2v.pod:650
 msgid ""
 "Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
 "should be I<-i libvirt>.  As this is the default, you don't need to specify "
@@ -90542,12 +90595,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:630
+#: ../v2v/virt-v2v.pod:654
 msgid "The libvirt URI of a vCenter server looks something like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:656
 #, no-wrap
 msgid ""
 " vpx://user@server/Datacenter/esxi\n"
@@ -90555,7 +90608,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:658
 msgid ""
 "where C<user@> is the (optional, but recommended) user to connect as, "
 "C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -90564,25 +90617,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:663
 msgid ""
 "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:641
+#: ../v2v/virt-v2v.pod:665
 msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:667
 msgid ""
 "Use the L<virsh(1)> command to list the guests on the vCenter Server like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:670
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -90591,7 +90644,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:649
+#: ../v2v/virt-v2v.pod:673
 #, no-wrap
 msgid ""
 "  Id    Name                           State\n"
@@ -90602,7 +90655,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:678
 msgid ""
 "If you get an error \"Peer certificate cannot be authenticated with given CA "
 "certificates\" or similar, then you can either import the ESX host's "
@@ -90611,7 +90664,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:683
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -90619,14 +90672,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:661 ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:685 ../v2v/virt-v2v.pod:753
 msgid ""
 "You should also try dumping the metadata from any guest on your server, like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:688
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -90638,7 +90691,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:694
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -90646,17 +90699,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:674
+#: ../v2v/virt-v2v.pod:698
 msgid "ESX: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:700
 msgid "To import a particular guest from vCenter Server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:678
+#: ../v2v/virt-v2v.pod:702
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -90666,13 +90719,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:706
 msgid ""
 "where C<Windows 2003> is the name of the guest (which must be shut down)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:709
 msgid ""
 "Note that you may be asked for the vCenter password I<twice>.  This happens "
 "once because libvirt needs it, and a second time because virt-v2v itself "
@@ -90680,7 +90733,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:689 ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:713 ../v2v/virt-v2v.pod:777
 msgid ""
 "In this case the output flags are set to write the converted guest to a "
 "temporary directory as this is just an example, but you can also write to "
@@ -90688,17 +90741,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:717
 msgid "INPUT FROM RHEL 5 XEN"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:695
+#: ../v2v/virt-v2v.pod:719
 msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:721
 msgid ""
 "Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
 "input mode should be I<-i libvirt>.  As this is the default, you don't need "
@@ -90706,33 +90759,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:701
+#: ../v2v/virt-v2v.pod:725
 msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:727
 msgid ""
 "Currently you must enable passwordless SSH access to the remote Xen host "
 "from the virt-v2v conversion server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:730
 msgid ""
 "You must also use ssh-agent, and add your ssh public key to C</root/.ssh/"
 "authorized_keys> (on the Xen host)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:709
+#: ../v2v/virt-v2v.pod:733
 msgid ""
 "After doing this, you should check that passwordless access works from the "
 "virt-v2v server to the Xen host.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:736
 #, no-wrap
 msgid ""
 " $ ssh root at xen.example.com\n"
@@ -90741,19 +90794,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:715
+#: ../v2v/virt-v2v.pod:739
 msgid ""
 "Note that password-interactive and Kerberos access are B<not> supported.  "
 "You B<have> to set up ssh access using ssh-agent and authorized_keys."
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:719
+#: ../v2v/virt-v2v.pod:743
 msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:745
 #, fuzzy
 #| msgid "Use L<virt-filesystems(1)> to list the filesystems in the guest."
 msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
@@ -90762,7 +90815,7 @@ msgstr ""
 "使用します。"
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:747
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -90774,7 +90827,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:756
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -90786,7 +90839,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:762
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration or the remote server before "
@@ -90794,17 +90847,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:742
+#: ../v2v/virt-v2v.pod:766
 msgid "XEN: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:744
+#: ../v2v/virt-v2v.pod:768
 msgid "To import a particular guest from a Xen server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:746
+#: ../v2v/virt-v2v.pod:770
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -90814,58 +90867,58 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:750
+#: ../v2v/virt-v2v.pod:774
 msgid ""
 "where C<rhel49-x86_64-pv> is the name of the guest (which must be shut down)."
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:781
 msgid "OUTPUT TO LIBVIRT"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:783
 msgid ""
 "The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
 "managed host.  There are several limitations:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:766
+#: ../v2v/virt-v2v.pod:790
 msgid ""
 "You can only use a local libvirt connection [see below for how to workaround "
 "this]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:795
 msgid ""
 "The I<-os pool> option must specify a directory pool, not anything more "
 "exotic such as iSCSI [but see below]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:776
+#: ../v2v/virt-v2v.pod:800
 msgid "You can only upload to a KVM hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:780
+#: ../v2v/virt-v2v.pod:804
 msgid ""
 "B<To output to a remote libvirt instance and/or a non-directory storage "
 "pool> you have to use the following workaround:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:787
+#: ../v2v/virt-v2v.pod:811
 msgid ""
 "Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
 "into a local temporary directory:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:814
 #, no-wrap
 msgid ""
 " virt-v2v [...] -o local -os /var/tmp\n"
@@ -90873,14 +90926,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:816
 #, fuzzy
 #| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgid "This creates two (or more) files in C</var/tmp> called:"
 msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:794
+#: ../v2v/virt-v2v.pod:818
 #, no-wrap
 msgid ""
 " /var/tmp/NAME.xml     # the libvirt XML (metadata)\n"
@@ -90889,17 +90942,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:821
 msgid "(for C<NAME> substitute the guest's name)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:801
+#: ../v2v/virt-v2v.pod:825
 msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:803
+#: ../v2v/virt-v2v.pod:827
 #, no-wrap
 msgid ""
 " size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -90909,14 +90962,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:809
+#: ../v2v/virt-v2v.pod:833
 msgid ""
 "Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name.  "
 "In other words, locate the following bit of XML:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:836
 #, no-wrap
 msgid ""
 " <disk type='file' device='disk'>\n"
@@ -90928,7 +90981,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:842
 msgid ""
 "and change two things: The C<type='file'> attribute must be changed to "
 "C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -90936,7 +90989,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:822
+#: ../v2v/virt-v2v.pod:846
 #, no-wrap
 msgid ""
 " <disk type='volume' device='disk'>\n"
@@ -90948,12 +91001,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:830
+#: ../v2v/virt-v2v.pod:854
 msgid "Define the final guest in libvirt:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:832
+#: ../v2v/virt-v2v.pod:856
 #, no-wrap
 msgid ""
 " virsh define /var/tmp/NAME.xml\n"
@@ -90961,19 +91014,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:860
 msgid "MINIMAL XML FOR -i libvirtxml OPTION"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:838
+#: ../v2v/virt-v2v.pod:862
 msgid ""
 "When using the I<-i libvirtxml> option, you have to supply some libvirt "
 "XML.  Writing this from scratch is hard, so the template below is helpful."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:866
 msgid ""
 "B<Note this should only be used for testing and/or where you know what "
 "you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -90981,7 +91034,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:846
+#: ../v2v/virt-v2v.pod:870
 #, no-wrap
 msgid ""
 " <domain type='kvm'>\n"
@@ -91014,7 +91067,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:875
+#: ../v2v/virt-v2v.pod:899
 msgid ""
 "The I<--machine-readable> option can be used to make the output more machine "
 "friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -91022,14 +91075,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:905
 msgid ""
 "Firstly use the option on its own to query the capabilities of the virt-v2v "
 "binary.  Typical output looks like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:884
+#: ../v2v/virt-v2v.pod:908
 #, no-wrap
 msgid ""
 " $ virt-v2v --machine-readable\n"
@@ -91045,7 +91098,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:921
 msgid ""
 "The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
 "output mode) options supported by this binary.  The C<convert:> features "
@@ -91053,7 +91106,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:923
+#: ../v2v/virt-v2v.pod:947
 msgid ""
 "The calling program should treat messages sent to stderr as error messages.  "
 "In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -91061,36 +91114,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:929
+#: ../v2v/virt-v2v.pod:953
 msgid ""
 "Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
 "all.  The option was added when virt-v2v was rewritten in 2014."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:960
 msgid "C</usr/share/virtio-win>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:938 ../v2v/virt-v2v.pod:992
+#: ../v2v/virt-v2v.pod:962 ../v2v/virt-v2v.pod:1016
 msgid "(Optional)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:940
+#: ../v2v/virt-v2v.pod:964
 msgid ""
 "If this directory is present, then virtio drivers for Windows guests will be "
 "found from this directory and installed in the guest during conversion."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:974
 msgid "C<TMPDIR>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:961
+#: ../v2v/virt-v2v.pod:985
 msgid ""
 "Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
 "use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -91100,31 +91153,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:995
 msgid ""
 "This can point to the directory containing data files used for Windows "
 "conversion."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:1007
 msgid "(Required when doing conversions of Windows guests)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:985
+#: ../v2v/virt-v2v.pod:1009
 msgid ""
 "This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
 "in the guest during conversion of Windows guests."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:990
+#: ../v2v/virt-v2v.pod:1014
 msgid "C<rhev-apt.exe>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:1018
 msgid ""
 "The RHEV Application Provisioning Tool (RHEV APT).  If this file is present, "
 "then RHEV APT will be installed in the Windows guest during conversion.  "
@@ -91134,14 +91187,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1000
+#: ../v2v/virt-v2v.pod:1024
 msgid ""
 "This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
 "distributed with virt-v2v."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1011
+#: ../v2v/virt-v2v.pod:1035
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
@@ -91149,23 +91202,23 @@ msgstr ""
 msgid ""
 "L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
 "L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
-"L<qemu-img(1)>, L<http://libguestfs.org/>."
+"L<qemu-img(1)>, L<fstrim(8)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-fs(1)>, "
 "L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1053
 msgid "Mike Latimer"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1055
 msgid "Shahar Havivi"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1057
 msgid "Tingting Zheng"
 msgstr ""
 
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 7b1cd7b..ed30666 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.27.54\n"
+"Project-Id-Version: libguestfs 1.27.55\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-24 19:02+0200\n"
+"POT-Creation-Date: 2014-09-26 17:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -421,12 +421,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:214 ../v2v/virt-v2v.pod:395
+#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:214 ../v2v/virt-v2v.pod:419
 msgid "B<-q>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:397
+#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:421
 msgid "B<--quiet>"
 msgstr ""
 
@@ -458,42 +458,42 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243 ../res [...]
 msgid "B<-v>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245 ../res [...]
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:226 ../v2v/virt-v2v.pod:481
+#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:226 ../v2v/virt-v2v.pod:505
 msgid "Enable verbose messages for debugging."
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
 msgid "B<-V>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
 msgid "B<--version>"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:67 ../p2v/virt-p2v-make-kickstart.pod:155 [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:67 ../p2v/virt-p2v-make-kickstart.pod:155 [...]
 msgid "Display version number and exit."
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
 msgid "B<-x>"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:236 ../v2v/virt-v2v [...]
+#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:236 ../v2v/virt-v2v [...]
 msgid "Enable tracing of libguestfs API calls."
 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:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
+#: ../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:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
 msgid "*"
 msgstr ""
 
@@ -823,7 +823,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
 msgid "SEE ALSO"
 msgstr ""
 
@@ -840,12 +840,12 @@ msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:111 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:111 ../p2v/vi [...]
 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:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1129,7 +1129,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:91 ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:946
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:91 ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:970
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
@@ -1148,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1256 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1256 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
 msgid "AUTHORS"
 msgstr ""
 
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
 msgstr ""
 
 #. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3369 ../p2v/virt-p2v-make-disk.pod:115 ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3369 ../p2v/virt-p2v-make-disk.pod:115 ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814 ../test-tool/libguestfs-test-tool.pod [...]
 msgid "Copyright (C) 2009-2014 Red Hat Inc."
 msgstr ""
 
@@ -1969,12 +1969,12 @@ msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:221
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:227
 msgid "B<--machine-readable>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:223
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:229
 msgid ""
 "This option is used to make the output more machine friendly when being "
 "parsed by other programs.  See L</MACHINE READABLE OUTPUT> below."
@@ -2061,7 +2061,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:715 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:715 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs. [...]
 msgid "1."
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:493 ../examples/guestfs-faq.pod:725 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:493 ../examples/guestfs-faq.pod:725 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs. [...]
 msgid "2."
 msgstr ""
 
@@ -2085,7 +2085,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:499 ../examples/guestfs-faq.pod:730 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:807 ../v2v/virt-v2v.pod:921
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:499 ../examples/guestfs-faq.pod:730 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:831 ../v2v/virt-v2v.pod:945
 msgid "3."
 msgstr ""
 
@@ -2098,7 +2098,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:828
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:852
 msgid "4."
 msgstr ""
 
@@ -4505,7 +4505,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:873
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:897
 msgid "MACHINE READABLE OUTPUT"
 msgstr ""
 
@@ -4539,7 +4539,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:894
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:918
 msgid ""
 "A list of features is printed, one per line, and the program exits with "
 "status 0."
@@ -4587,7 +4587,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:969
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:993
 msgid "C<VIRT_TOOLS_DATA_DIR>"
 msgstr ""
 
@@ -4599,19 +4599,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:974
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:998
 msgid ""
 "Normally you do not need to set this.  If not set, a compiled-in default "
 "will be used (something like C</usr/share/virt-tools>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:977
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1001
 msgid "This directory may contain the following files:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:981
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1005
 msgid "C<rhsrvany.exe>"
 msgstr ""
 
@@ -4624,7 +4624,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:988
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1012
 msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
 msgstr ""
 
@@ -7348,7 +7348,7 @@ msgid "This program returns 0 on success, or 1 if there was an error."
 msgstr ""
 
 #. type: textblock
-#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1007
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1031
 msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
@@ -7474,7 +7474,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71 ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:932
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71 ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:956
 msgid "FILES"
 msgstr ""
 
@@ -48531,7 +48531,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1026
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1051
 msgid "Matthew Booth"
 msgstr ""
 
@@ -50435,7 +50435,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:879
+#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:903
 msgid "There are two ways to use this option."
 msgstr ""
 
@@ -50460,26 +50460,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:901
+#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:925
 msgid ""
 "Secondly use the option in conjunction with other options to make the "
 "regular program output more machine friendly."
 msgstr ""
 
 #. type: textblock
-#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:904
+#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:928
 msgid "At the moment this means:"
 msgstr ""
 
 #. type: textblock
-#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:910
+#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:934
 msgid ""
 "Progress bar messages can be parsed from stdout by looking for this regular "
 "expression:"
 msgstr ""
 
 #. type: verbatim
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:913
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:937
 #, no-wrap
 msgid ""
 " ^[0-9]+/[0-9]+$\n"
@@ -50487,7 +50487,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:917
+#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:941
 msgid ""
 "The calling program should treat messages sent to stdout (except for "
 "progress bar messages) as status messages.  They can be logged and/or "
@@ -51130,7 +51130,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:399
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:423
 msgid "This disables progress bars and other unnecessary output."
 msgstr ""
 
@@ -51303,7 +51303,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:952
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:976
 msgid ""
 "Location of the temporary directory used for the potentially large temporary "
 "overlay file."
@@ -51317,7 +51317,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:955
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:979
 msgid ""
 "You should ensure there is enough free space in the worst case for a full "
 "copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -51325,7 +51325,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:959
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:983
 msgid "This defaults to C</tmp>."
 msgstr ""
 
@@ -51340,7 +51340,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:967
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:991
 #, no-wrap
 msgid ""
 " mount -o remount,size=10G /tmp\n"
@@ -79909,16 +79909,28 @@ msgstr ""
 
 #. type: =item
 #: ../v2v/virt-v2v.pod:164
-msgid "B<-i disk>"
+msgid "B<--debug-overlays>"
 msgstr ""
 
 #. type: textblock
 #: ../v2v/virt-v2v.pod:166
+msgid ""
+"Save the overlay file(s) created during conversion.  This option is only "
+"used for debugging virt-v2v and may be removed in a future version."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:170
+msgid "B<-i disk>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:172
 msgid "Set the input method to I<disk>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:174
 msgid ""
 "In this mode you can read a virtual machine disk image with no metadata.  "
 "virt-v2v tries to guess the best default metadata.  This is usually adequate "
@@ -79928,34 +79940,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
 msgid "B<-i libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:182
 msgid "Set the input method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:184
 msgid ""
 "In this mode you have to specify a libvirt guest name or UUID on the command "
 "line.  You may also specify a libvirt connection URI (see I<-ic>)."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:188
 msgid "B<-i libvirtxml>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
 msgid "Set the input method to I<libvirtxml>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
 msgid ""
 "In this mode you have to pass a libvirt XML file on the command line.  This "
 "file is read in order to get metadata about the source guest (such as its "
@@ -79964,27 +79976,27 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:197
 msgid "B<-i local>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:199
 msgid "This is the same as I<-i disk>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:201
 msgid "B<-i ova>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:203
 msgid "Set the input method to I<ova>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:205
 msgid ""
 "In this mode you can read a VMware ova file.  Virt-v2v will read the ova "
 "manifest file and check the vmdk volumes for validity (checksums)  as well "
@@ -79992,19 +80004,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
 msgid "B<-ic> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:211
 msgid ""
 "Specify a libvirt connection URI to use when reading the guest.  This is "
 "only used when S<I<-i libvirt>>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:208
+#: ../v2v/virt-v2v.pod:214
 msgid ""
 "Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
 "connections can be used.  Other remote libvirt connections will not work in "
@@ -80012,46 +80024,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
 msgid ""
 "See also L</INPUT FROM VMWARE VCENTER SERVER>, L</INPUT FROM RHEL 5 XEN> "
 "below."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:221
 msgid "B<-if> format"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
 msgid ""
 "For I<-i disk> only, this specifies the format of the input disk image.  For "
 "other input methods you should specify the input format in the metadata."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
 msgid "B<--network> in:out"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:235
 msgid "B<--network> out"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
 msgid "B<--bridge> in:out"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:239
 msgid "B<--bridge> out"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:241
 msgid ""
 "Map network (or bridge) called C<in> to network (or bridge) called C<out>.  "
 "If no C<in:> prefix is given, all other networks (or bridges)  are mapped to "
@@ -80059,17 +80071,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:245
 msgid "See L</NETWORKS AND BRIDGES> below."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:247
 msgid "B<--no-copy>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:249
 msgid ""
 "Don't copy the disks.  Instead, conversion is performed (and thrown away), "
 "and metadata is written, but no disks are created.  See also discussion of "
@@ -80077,7 +80089,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
 msgid ""
 "This is useful in two cases: Either you want to test if conversion is likely "
 "to succeed, without the long copying process.  Or you are only interested in "
@@ -80085,34 +80097,69 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
 msgid ""
 "This option is not compatible with I<-o libvirt> since it would create a "
 "faulty guest (one with no disks)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:260
 msgid "This option is not compatible with I<-o glance> for technical reasons."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:262
+msgid "B<--no-trim all>"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:264
+msgid "B<--no-trim> mp[,mp...]"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:266
+msgid ""
+"By default virt-v2v runs L<fstrim(8)> to reduce the amount of data that "
+"needs to be copied.  This is known to break some buggy bootloaders causing "
+"boot failures after conversion (see for example "
+"L<https://bugzilla.redhat.com/show_bug.cgi?id=1141145#c27>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:271
+msgid ""
+"You can use I<--no-trim all> to disable all trimming.  Note this will "
+"greatly increase the amount of data that has to be copied and can make "
+"virt-v2v run much more slowly."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:275
+msgid ""
+"You can also disable trimming on selected filesystems only (specified by a "
+"comma-separated list of their mount point(s) in the guest).  Typically you "
+"would use I<--no-trim /boot> to work around the grub bug mentioned above."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:280
 msgid "B<-o disk>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:282
 msgid "This is the same as I<-o local>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:284
 msgid "B<-o glance>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:286
 msgid ""
 "Set the output method to OpenStack Glance.  In this mode the converted guest "
 "is uploaded to Glance.  You can control the image name by setting the I<-on> "
@@ -80120,39 +80167,39 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:290
 msgid "B<-o libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:292
 msgid "Set the output method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:294
 msgid ""
 "In this mode, the converted guest is created as a libvirt guest.  You may "
 "also specify a libvirt connection URI (see I<-oc>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:297
 msgid "See L</OUTPUT TO LIBVIRT> below."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:299
 msgid "B<-o local>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:301
 msgid "Set the output method to I<local>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:303
 msgid ""
 "In this mode, the converted guest is written to a local directory specified "
 "by I<-os /dir> (the directory must exist).  The converted guest's disks are "
@@ -80160,7 +80207,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
 #, no-wrap
 msgid ""
 " /dir/name-sda\n"
@@ -80170,12 +80217,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:311
 msgid "and a libvirt XML file is created containing guest metadata:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:313
 #, no-wrap
 msgid ""
 " /dir/name.xml\n"
@@ -80183,49 +80230,49 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:315
 msgid "where C<name> is the guest name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:317
 msgid "B<-o null>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:319
 msgid "Set the output method to I<null>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:297
+#: ../v2v/virt-v2v.pod:321
 msgid ""
 "The guest is converted and copied (unless you also specify I<--no-copy>), "
 "but the results are thrown away and no metadata is written."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:325
 msgid "B<-o ovirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
 msgid "This is the same as I<-o rhev>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:329
 msgid "B<-o qemu>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:331
 msgid "Set the output method to I<qemu>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:333
 msgid ""
 "This is similar to I<-o local>, except that a shell script is written which "
 "you can use to boot the guest in qemu.  The converted disks and shell script "
@@ -80233,24 +80280,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:313
+#: ../v2v/virt-v2v.pod:337
 msgid ""
 "When using this output mode, you can also specify the I<--qemu-boot> option "
 "which boots the guest under qemu immediately."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:340
 msgid "B<-o rhev>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:342
 msgid "Set the output method to I<rhev>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:344
 msgid ""
 "The converted guest is written to a RHEV Export Storage Domain.  The I<-os> "
 "parameter must also be used to specify the location of the Export Storage "
@@ -80259,116 +80306,116 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:325
+#: ../v2v/virt-v2v.pod:349
 msgid "B<-o vdsm>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
 msgid "Set the output method to I<vdsm>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:353
 msgid ""
 "This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
 "runs virt-v2v under VDSM control."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
 msgid "B<-oa sparse>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
 msgid "B<-oa preallocated>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
 msgid "Set the output file allocation mode.  The default is C<sparse>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:362
 msgid "B<-oc> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
 msgid ""
 "Specify a libvirt connection to use when writing the converted guest.  This "
 "is only used when S<I<-o libvirt>>.  See L</OUTPUT TO LIBVIRT> below."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:367
 msgid ""
 "Only local libvirt connections can be used.  Remote libvirt connections will "
 "not work."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
 msgid "B<-of> format"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
 msgid "When converting the guest, convert the disks to the given format."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
 msgid "If not specified, then the input format is used."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
 msgid "B<-on> name"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:378
 msgid ""
 "Rename the guest when converting it.  If this option is not used then the "
 "output name is the same as the input name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
 msgid "B<-os> storage"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:359
+#: ../v2v/virt-v2v.pod:383
 msgid "The location of the storage for the converted guest."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:385
 msgid ""
 "For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
 "pool-list>>) or pool UUID."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:388
 msgid ""
 "For I<-o local> and I<-o qemu>, this is a directory name.  The directory "
 "must exist."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:367
+#: ../v2v/virt-v2v.pod:391
 msgid ""
 "For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
 "form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:394
 #, no-wrap
 msgid ""
 " rhev-storage.example.com:/rhev/export\n"
@@ -80376,7 +80423,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:396
 msgid ""
 "The NFS export must be mountable and writable by the user and host running "
 "virt-v2v, since the virt-v2v program has to actually mount it when it runs.  "
@@ -80384,7 +80431,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:400
 msgid ""
 "B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
 "the mountpoint.  Note that virt-v2v will still need to write to this remote "
@@ -80392,19 +80439,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:405
 msgid ""
 "You will get an error if virt-v2v is unable to mount/write to the Export "
 "Storage Domain."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:408
 msgid "B<--print-source>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:410
 msgid ""
 "Print information about the source guest and stop.  This option is useful "
 "when you are setting up network and bridge maps.  See L</NETWORKS AND "
@@ -80412,49 +80459,49 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:414
 msgid "B<--qemu-boot>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:416
 msgid ""
 "When using I<-o qemu> only, this boots the guest immediately after virt-v2v "
 "finishes."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
 msgid "B<--root ask>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:427
 msgid "B<--root single>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:429
 msgid "B<--root first>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:431
 msgid "B<--root> /dev/sdX"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:433
 msgid "B<--root> /dev/VG/LV"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:435
 msgid "Choose the root filesystem to be converted."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
 msgid ""
 "In the case where the virtual machine is dual-boot or multi-boot, or where "
 "the VM has other filesystems that look like operating systems, this option "
@@ -80465,14 +80512,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:421
+#: ../v2v/virt-v2v.pod:445
 msgid ""
 "The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
 "virt-v2v to die if a multi-boot operating system is found."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:424
+#: ../v2v/virt-v2v.pod:448
 msgid ""
 "Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
 "found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -80481,7 +80528,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:453
 msgid ""
 "S<I<--root first>> means to choose the first root device in the case of a "
 "multi-boot operating system.  Since this is a heuristic, it may sometimes "
@@ -80489,7 +80536,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:457
 msgid ""
 "You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
 "mean to use the second partition on the first hard drive.  If the named root "
@@ -80498,7 +80545,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:462
 msgid ""
 "Note that there is a bug in grub which prevents it from successfully booting "
 "a multiboot system if VirtIO is enabled.  Grub is only able to boot an "
@@ -80508,22 +80555,22 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
 msgid "B<--vdsm-image-uuid> UUID"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:470
 msgid "B<--vdsm-vol-uuid> UUID"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
 msgid "B<--vdsm-vm-uuid> UUID"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
 msgid ""
 "Normally the RHEV output mode chooses random UUIDs for the target guest.  "
 "However VDSM needs to control the UUIDs and passes these parameters when "
@@ -80531,46 +80578,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
 msgid "the image directory (I<--vdsm-image-uuid>)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:487
 msgid ""
 "UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
 "for each guest disk)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:492
 msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:496
 msgid ""
 "The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
 "digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:499
 msgid "These options can only be used with I<-o vdsm>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:513
 msgid "B<--vmtype desktop>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:491
+#: ../v2v/virt-v2v.pod:515
 msgid "B<--vmtype server>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:517
 msgid ""
 "For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest.  "
 "You can set this to C<desktop> or C<server>.  If the option is not given, "
@@ -80579,12 +80626,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:504
+#: ../v2v/virt-v2v.pod:528
 msgid "XEN PARAVIRTUALIZED GUESTS"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:530
 msgid ""
 "Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
 "a KVM guest by installing a new kernel.  This version of virt-v2v does "
@@ -80593,7 +80640,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:535
 msgid ""
 "Therefore before conversion you should check that a regular kernel is "
 "installed.  For some older Linux distributions, this means installing a "
@@ -80601,7 +80648,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:539
 #, no-wrap
 msgid ""
 " RHEL 3         (Does not apply, as there was no Xen PV kernel)\n"
@@ -80609,7 +80656,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:541
 #, no-wrap
 msgid ""
 " RHEL 4         i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -80622,7 +80669,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:548
 #, no-wrap
 msgid ""
 " RHEL 5         i686: install 'kernel-PAE'\n"
@@ -80631,7 +80678,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:527
+#: ../v2v/virt-v2v.pod:551
 #, no-wrap
 msgid ""
 " SLES 10        i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -80643,7 +80690,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:557
 #, no-wrap
 msgid ""
 " SLES 11+       i586: install 'kernel-pae'\n"
@@ -80652,7 +80699,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:560
 #, no-wrap
 msgid ""
 " Windows        (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -80660,19 +80707,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:562
 msgid "ENABLING VIRTIO"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:564
 msgid ""
 "\"Virtio\" is the name for a set of drivers which make disk (block device), "
 "network and other guest operations work much faster on KVM."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:567
 msgid ""
 "Older versions of virt-v2v could install these drivers for certain Linux "
 "guests.  This version of virt-v2v does I<not> attempt to install new Linux "
@@ -80680,7 +80727,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:548
+#: ../v2v/virt-v2v.pod:572
 msgid ""
 "In order to enable virtio, and hence improve performance of the guest after "
 "conversion, you should ensure that the B<minimum> versions of packages are "
@@ -80688,7 +80735,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:553
+#: ../v2v/virt-v2v.pod:577
 #, no-wrap
 msgid ""
 " RHEL 3         No virtio drivers are available\n"
@@ -80696,7 +80743,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:555
+#: ../v2v/virt-v2v.pod:579
 #, no-wrap
 msgid ""
 " RHEL 4         kernel >= 2.5.9-89.EL\n"
@@ -80704,7 +80751,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:581
 #, no-wrap
 msgid ""
 " RHEL 5         kernel >= 2.6.18-128.el5\n"
@@ -80714,7 +80761,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:585
 #, no-wrap
 msgid ""
 " RHEL 6+        All versions support virtio\n"
@@ -80722,7 +80769,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:587
 #, no-wrap
 msgid ""
 " Fedora         All versions support virtio\n"
@@ -80730,7 +80777,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:589
 #, no-wrap
 msgid ""
 " SLES 11+       All versions support virtio\n"
@@ -80738,7 +80785,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:591
 #, no-wrap
 msgid ""
 " SLES 10        kernel >= 2.6.16.60-0.85.1\n"
@@ -80746,7 +80793,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:593
 #, no-wrap
 msgid ""
 " OpenSUSE 11+   All versions support virtio\n"
@@ -80754,7 +80801,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:571
+#: ../v2v/virt-v2v.pod:595
 #, no-wrap
 msgid ""
 " OpenSUSE 10    kernel >= 2.6.25.5-1.1\n"
@@ -80762,7 +80809,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:597
 #, no-wrap
 msgid ""
 " Windows        Drivers are installed from /usr/share/virtio-win\n"
@@ -80771,12 +80818,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:576
+#: ../v2v/virt-v2v.pod:600
 msgid "NETWORKS AND BRIDGES"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:602
 msgid ""
 "Guests are usually connected to one or more networks, and when converted to "
 "the target hypervisor you usually want to reconnect those networks at the "
@@ -80784,7 +80831,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:607
 msgid ""
 "If you are unsure of what networks and bridges are in use on the source "
 "hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -80794,14 +80841,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:613
 msgid ""
 "In the I<--print-source> output you will see a section showing the guest's "
 "Network Interface Cards (NICs):"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:616
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -80812,21 +80859,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:597
+#: ../v2v/virt-v2v.pod:621
 msgid ""
 "This is typical of a libvirt guest: It has a single network interface "
 "connected to a network called C<default>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:624
 msgid ""
 "To map a specific network to a target network, for example C<default> on the "
 "source to C<rhevm> on the target, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:627
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network default:rhevm\n"
@@ -80834,12 +80881,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:629
 msgid "To map every network to a target network, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:631
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network rhevm\n"
@@ -80847,14 +80894,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:609
+#: ../v2v/virt-v2v.pod:633
 msgid ""
 "Bridges are handled in the same way, but you have to use the I<--bridge> "
 "option instead.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:612
+#: ../v2v/virt-v2v.pod:636
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -80865,7 +80912,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:617
+#: ../v2v/virt-v2v.pod:641
 #, no-wrap
 msgid ""
 " $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -80873,22 +80920,22 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:619
+#: ../v2v/virt-v2v.pod:643
 msgid "INPUT FROM VMWARE VCENTER SERVER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:621
+#: ../v2v/virt-v2v.pod:645
 msgid "Virt-v2v is able to import guests from VMware vCenter Server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:623
+#: ../v2v/virt-v2v.pod:647
 msgid "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:626
+#: ../v2v/virt-v2v.pod:650
 msgid ""
 "Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
 "should be I<-i libvirt>.  As this is the default, you don't need to specify "
@@ -80896,12 +80943,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:630
+#: ../v2v/virt-v2v.pod:654
 msgid "The libvirt URI of a vCenter server looks something like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:656
 #, no-wrap
 msgid ""
 " vpx://user@server/Datacenter/esxi\n"
@@ -80909,7 +80956,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:658
 msgid ""
 "where C<user@> is the (optional, but recommended) user to connect as, "
 "C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -80918,24 +80965,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:663
 msgid "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:641
+#: ../v2v/virt-v2v.pod:665
 msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:667
 msgid ""
 "Use the L<virsh(1)> command to list the guests on the vCenter Server like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:670
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -80944,7 +80991,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:649
+#: ../v2v/virt-v2v.pod:673
 #, no-wrap
 msgid ""
 "  Id    Name                           State\n"
@@ -80955,7 +81002,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:678
 msgid ""
 "If you get an error \"Peer certificate cannot be authenticated with given CA "
 "certificates\" or similar, then you can either import the ESX host's "
@@ -80964,7 +81011,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:683
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list "
@@ -80973,14 +81020,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:661 ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:685 ../v2v/virt-v2v.pod:753
 msgid ""
 "You should also try dumping the metadata from any guest on your server, like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:688
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows "
@@ -80993,7 +81040,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:694
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -81001,17 +81048,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:674
+#: ../v2v/virt-v2v.pod:698
 msgid "ESX: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:700
 msgid "To import a particular guest from vCenter Server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:678
+#: ../v2v/virt-v2v.pod:702
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' "
@@ -81022,12 +81069,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:706
 msgid "where C<Windows 2003> is the name of the guest (which must be shut down)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:709
 msgid ""
 "Note that you may be asked for the vCenter password I<twice>.  This happens "
 "once because libvirt needs it, and a second time because virt-v2v itself "
@@ -81035,7 +81082,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:689 ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:713 ../v2v/virt-v2v.pod:777
 msgid ""
 "In this case the output flags are set to write the converted guest to a "
 "temporary directory as this is just an example, but you can also write to "
@@ -81043,17 +81090,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:717
 msgid "INPUT FROM RHEL 5 XEN"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:695
+#: ../v2v/virt-v2v.pod:719
 msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:721
 msgid ""
 "Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
 "input mode should be I<-i libvirt>.  As this is the default, you don't need "
@@ -81061,33 +81108,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:701
+#: ../v2v/virt-v2v.pod:725
 msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:727
 msgid ""
 "Currently you must enable passwordless SSH access to the remote Xen host "
 "from the virt-v2v conversion server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:730
 msgid ""
 "You must also use ssh-agent, and add your ssh public key to "
 "C</root/.ssh/authorized_keys> (on the Xen host)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:709
+#: ../v2v/virt-v2v.pod:733
 msgid ""
 "After doing this, you should check that passwordless access works from the "
 "virt-v2v server to the Xen host.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:736
 #, no-wrap
 msgid ""
 " $ ssh root at xen.example.com\n"
@@ -81096,24 +81143,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:715
+#: ../v2v/virt-v2v.pod:739
 msgid ""
 "Note that password-interactive and Kerberos access are B<not> supported.  "
 "You B<have> to set up ssh access using ssh-agent and authorized_keys."
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:719
+#: ../v2v/virt-v2v.pod:743
 msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:745
 msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:747
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -81125,7 +81172,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:756
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -81137,7 +81184,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:762
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration or the remote server before "
@@ -81145,17 +81192,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:742
+#: ../v2v/virt-v2v.pod:766
 msgid "XEN: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:744
+#: ../v2v/virt-v2v.pod:768
 msgid "To import a particular guest from a Xen server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:746
+#: ../v2v/virt-v2v.pod:770
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -81165,59 +81212,59 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:750
+#: ../v2v/virt-v2v.pod:774
 msgid ""
 "where C<rhel49-x86_64-pv> is the name of the guest (which must be shut "
 "down)."
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:781
 msgid "OUTPUT TO LIBVIRT"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:783
 msgid ""
 "The I<-o libvirt> option lets you upload the converted guest to a "
 "libvirt-managed host.  There are several limitations:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:766
+#: ../v2v/virt-v2v.pod:790
 msgid ""
 "You can only use a local libvirt connection [see below for how to workaround "
 "this]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:795
 msgid ""
 "The I<-os pool> option must specify a directory pool, not anything more "
 "exotic such as iSCSI [but see below]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:776
+#: ../v2v/virt-v2v.pod:800
 msgid "You can only upload to a KVM hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:780
+#: ../v2v/virt-v2v.pod:804
 msgid ""
 "B<To output to a remote libvirt instance and/or a non-directory storage "
 "pool> you have to use the following workaround:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:787
+#: ../v2v/virt-v2v.pod:811
 msgid ""
 "Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
 "into a local temporary directory:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:814
 #, no-wrap
 msgid ""
 " virt-v2v [...] -o local -os /var/tmp\n"
@@ -81225,12 +81272,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:816
 msgid "This creates two (or more) files in C</var/tmp> called:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:794
+#: ../v2v/virt-v2v.pod:818
 #, no-wrap
 msgid ""
 " /var/tmp/NAME.xml     # the libvirt XML (metadata)\n"
@@ -81239,17 +81286,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:821
 msgid "(for C<NAME> substitute the guest's name)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:801
+#: ../v2v/virt-v2v.pod:825
 msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:803
+#: ../v2v/virt-v2v.pod:827
 #, no-wrap
 msgid ""
 " size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -81259,14 +81306,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:809
+#: ../v2v/virt-v2v.pod:833
 msgid ""
 "Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name.  "
 "In other words, locate the following bit of XML:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:836
 #, no-wrap
 msgid ""
 " <disk type='file' device='disk'>\n"
@@ -81278,7 +81325,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:842
 msgid ""
 "and change two things: The C<type='file'> attribute must be changed to "
 "C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -81286,7 +81333,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:822
+#: ../v2v/virt-v2v.pod:846
 #, no-wrap
 msgid ""
 " <disk type='volume' device='disk'>\n"
@@ -81298,12 +81345,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:830
+#: ../v2v/virt-v2v.pod:854
 msgid "Define the final guest in libvirt:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:832
+#: ../v2v/virt-v2v.pod:856
 #, no-wrap
 msgid ""
 " virsh define /var/tmp/NAME.xml\n"
@@ -81311,19 +81358,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:860
 msgid "MINIMAL XML FOR -i libvirtxml OPTION"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:838
+#: ../v2v/virt-v2v.pod:862
 msgid ""
 "When using the I<-i libvirtxml> option, you have to supply some libvirt "
 "XML.  Writing this from scratch is hard, so the template below is helpful."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:866
 msgid ""
 "B<Note this should only be used for testing and/or where you know what "
 "you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -81331,7 +81378,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:846
+#: ../v2v/virt-v2v.pod:870
 #, no-wrap
 msgid ""
 " <domain type='kvm'>\n"
@@ -81364,7 +81411,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:875
+#: ../v2v/virt-v2v.pod:899
 msgid ""
 "The I<--machine-readable> option can be used to make the output more machine "
 "friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -81372,14 +81419,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:905
 msgid ""
 "Firstly use the option on its own to query the capabilities of the virt-v2v "
 "binary.  Typical output looks like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:884
+#: ../v2v/virt-v2v.pod:908
 #, no-wrap
 msgid ""
 " $ virt-v2v --machine-readable\n"
@@ -81395,7 +81442,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:921
 msgid ""
 "The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
 "output mode) options supported by this binary.  The C<convert:> features "
@@ -81403,7 +81450,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:923
+#: ../v2v/virt-v2v.pod:947
 msgid ""
 "The calling program should treat messages sent to stderr as error messages.  "
 "In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -81411,36 +81458,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:929
+#: ../v2v/virt-v2v.pod:953
 msgid ""
 "Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
 "all.  The option was added when virt-v2v was rewritten in 2014."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:960
 msgid "C</usr/share/virtio-win>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:938 ../v2v/virt-v2v.pod:992
+#: ../v2v/virt-v2v.pod:962 ../v2v/virt-v2v.pod:1016
 msgid "(Optional)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:940
+#: ../v2v/virt-v2v.pod:964
 msgid ""
 "If this directory is present, then virtio drivers for Windows guests will be "
 "found from this directory and installed in the guest during conversion."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:974
 msgid "C<TMPDIR>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:961
+#: ../v2v/virt-v2v.pod:985
 msgid ""
 "Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
 "use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -81450,31 +81497,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:995
 msgid ""
 "This can point to the directory containing data files used for Windows "
 "conversion."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:1007
 msgid "(Required when doing conversions of Windows guests)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:985
+#: ../v2v/virt-v2v.pod:1009
 msgid ""
 "This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
 "in the guest during conversion of Windows guests."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:990
+#: ../v2v/virt-v2v.pod:1014
 msgid "C<rhev-apt.exe>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:1018
 msgid ""
 "The RHEV Application Provisioning Tool (RHEV APT).  If this file is present, "
 "then RHEV APT will be installed in the Windows guest during conversion.  "
@@ -81484,31 +81531,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1000
+#: ../v2v/virt-v2v.pod:1024
 msgid ""
 "This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
 "distributed with virt-v2v."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1011
+#: ../v2v/virt-v2v.pod:1035
 msgid ""
 "L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
 "L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
-"L<qemu-img(1)>, L<http://libguestfs.org/>."
+"L<qemu-img(1)>, L<fstrim(8)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1053
 msgid "Mike Latimer"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1055
 msgid "Shahar Havivi"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1057
 msgid "Tingting Zheng"
 msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index f71a5fe..0afd611 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-23 16:53+0200\n"
+"POT-Creation-Date: 2014-09-26 17:11+0200\n"
 "PO-Revision-Date: 2014-07-22 18:04+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -736,7 +736,7 @@ msgstr ""
 #: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
 #: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:214
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:419
 msgid "B<-q>"
 msgstr "B<-q>"
 
@@ -744,7 +744,7 @@ msgstr "B<-q>"
 #: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
 #: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
 #: ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:397
+#: ../sysprep/virt-sysprep.pod:216 ../v2v/virt-v2v.pod:421
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
@@ -794,7 +794,7 @@ msgstr ""
 #: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243
 #: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
 #: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:501
 msgid "B<-v>"
 msgstr "B<-v>"
 
@@ -809,7 +809,7 @@ msgstr "B<-v>"
 #: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245
 #: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
 #: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
-#: ../v2v/virt-v2v.pod:479
+#: ../v2v/virt-v2v.pod:503
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
@@ -821,7 +821,7 @@ msgstr "B<--verbose>"
 #: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
 #: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
 #: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:226
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:505
 msgid "Enable verbose messages for debugging."
 msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
 
@@ -840,7 +840,7 @@ msgstr "Увімкнути докладний показ повідомлень
 #: ../p2v/virt-p2v.pod:249 ../rescue/virt-rescue.pod:244
 #: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
 #: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:507
 msgid "B<-V>"
 msgstr "B<-V>"
 
@@ -860,7 +860,7 @@ msgstr "B<-V>"
 #: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
 #: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
 #: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:485
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:509
 msgid "B<--version>"
 msgstr "B<--version>"
 
@@ -876,7 +876,7 @@ msgstr "B<--version>"
 #: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
 #: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
 #: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:487
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:511
 msgid "Display version number and exit."
 msgstr "Показати дані щодо версії і завершити роботу."
 
@@ -891,7 +891,7 @@ msgstr "Показати дані щодо версії і завершити р
 #: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
 #: ../resize/virt-resize.pod:593 ../sparsify/virt-sparsify.pod:304
 #: ../sysprep/virt-sysprep.pod:234 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:498
+#: ../v2v/virt-v2v.pod:522
 msgid "B<-x>"
 msgstr "B<-x>"
 
@@ -904,7 +904,7 @@ msgstr "B<-x>"
 #: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
 #: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595
 #: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:236
-#: ../v2v/virt-v2v.pod:500
+#: ../v2v/virt-v2v.pod:524
 msgid "Enable tracing of libguestfs API calls."
 msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
 
@@ -1375,9 +1375,9 @@ msgstr "Ця програма повертає:"
 #: ../sysprep/virt-sysprep.pod:414 ../tools/virt-win-reg:194
 #: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
 #: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:457 ../v2v/virt-v2v.pod:461
-#: ../v2v/virt-v2v.pod:466 ../v2v/virt-v2v.pod:764 ../v2v/virt-v2v.pod:769
-#: ../v2v/virt-v2v.pod:774
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:481 ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:490 ../v2v/virt-v2v.pod:788 ../v2v/virt-v2v.pod:793
+#: ../v2v/virt-v2v.pod:798
 msgid "*"
 msgstr "*"
 
@@ -1455,7 +1455,7 @@ msgstr ""
 #: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4748
 #: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
 #: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1009
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1033
 msgid "SEE ALSO"
 msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
 
@@ -1495,7 +1495,7 @@ msgstr "АВТОР"
 #: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
 #: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
 #: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1024
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1049
 msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 
@@ -1526,7 +1526,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4812
 #: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
 #: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1034
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1059
 msgid "COPYRIGHT"
 msgstr "АВТОРСЬКІ ПРАВА"
 
@@ -1843,7 +1843,7 @@ msgstr ""
 #: ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388
 #: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640
 #: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:946
+#: ../v2v/virt-v2v.pod:970
 msgid "ENVIRONMENT VARIABLES"
 msgstr "ЗМІННІ СЕРЕДОВИЩА"
 
@@ -1882,7 +1882,7 @@ msgstr ""
 #: ../python/examples/guestfs-python.pod:65
 #: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4808
 #: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1022
+#: ../v2v/virt-v2v.pod:1047
 msgid "AUTHORS"
 msgstr "АВТОРИ"
 
@@ -1913,7 +1913,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
 #: ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273
 #: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814
 #: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1036
+#: ../v2v/virt-v2v.pod:1061
 msgid "Copyright (C) 2009-2014 Red Hat Inc."
 msgstr "© Red Hat Inc., 2009–2014"
 
@@ -2804,13 +2804,13 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:221
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:227
 msgid "B<--machine-readable>"
 msgstr "B<--machine-readable>"
 
 #. type: textblock
 #: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:223
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:229
 msgid ""
 "This option is used to make the output more machine friendly when being "
 "parsed by other programs.  See L</MACHINE READABLE OUTPUT> below."
@@ -2906,8 +2906,8 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29
 #: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
 #: ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091
-#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:785
-#: ../v2v/virt-v2v.pod:908
+#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:809
+#: ../v2v/virt-v2v.pod:932
 msgid "1."
 msgstr "1."
 
@@ -2926,8 +2926,8 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42
 #: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
 #: ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095
-#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:799
-#: ../v2v/virt-v2v.pod:915
+#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:823
+#: ../v2v/virt-v2v.pod:939
 msgid "2."
 msgstr "2."
 
@@ -2945,8 +2945,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
 #: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
 #: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:807
-#: ../v2v/virt-v2v.pod:921
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:831
+#: ../v2v/virt-v2v.pod:945
 msgid "3."
 msgstr "3."
 
@@ -2961,7 +2961,7 @@ msgstr ""
 #. type: =item
 #: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
 #: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:828
+#: ../v2v/virt-v2v.pod:852
 msgid "4."
 msgstr "4."
 
@@ -5512,7 +5512,7 @@ msgstr ""
 
 #. type: =head1
 #: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:873
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:897
 msgid "MACHINE READABLE OUTPUT"
 msgstr ""
 
@@ -5547,7 +5547,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:894
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:918
 msgid ""
 "A list of features is printed, one per line, and the program exits with "
 "status 0."
@@ -5596,7 +5596,7 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:969
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:993
 msgid "C<VIRT_TOOLS_DATA_DIR>"
 msgstr ""
 
@@ -5610,7 +5610,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:974
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:998
 msgid ""
 "Normally you do not need to set this.  If not set, a compiled-in default "
 "will be used (something like C</usr/share/virt-tools>)."
@@ -5618,13 +5618,13 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:977
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1001
 msgid "This directory may contain the following files:"
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:981
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1005
 msgid "C<rhsrvany.exe>"
 msgstr ""
 
@@ -5639,7 +5639,7 @@ msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:988
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1012
 msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
 msgstr ""
 
@@ -8712,7 +8712,7 @@ msgstr ""
 
 #. type: textblock
 #: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1007
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1031
 msgid ""
 "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
@@ -8848,7 +8848,7 @@ msgstr ""
 #: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
 #: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71
 #: ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:932
+#: ../v2v/virt-v2v.pod:956
 msgid "FILES"
 msgstr "ФАЙЛИ"
 
@@ -52093,7 +52093,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1026
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:1051
 msgid "Matthew Booth"
 msgstr ""
 
@@ -54105,7 +54105,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:879
+#: ../v2v/virt-v2v.pod:903
 msgid "There are two ways to use this option."
 msgstr "Існує два способи використання цього параметра."
 
@@ -54138,7 +54138,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:901
+#: ../v2v/virt-v2v.pod:925
 msgid ""
 "Secondly use the option in conjunction with other options to make the "
 "regular program output more machine friendly."
@@ -54146,13 +54146,13 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:904
+#: ../v2v/virt-v2v.pod:928
 msgid "At the moment this means:"
 msgstr "У поточній версії це означає таке:"
 
 #. type: textblock
 #: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:910
+#: ../v2v/virt-v2v.pod:934
 msgid ""
 "Progress bar messages can be parsed from stdout by looking for this regular "
 "expression:"
@@ -54160,7 +54160,7 @@ msgstr ""
 
 #. type: verbatim
 #: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:913
+#: ../v2v/virt-v2v.pod:937
 #, no-wrap
 msgid ""
 " ^[0-9]+/[0-9]+$\n"
@@ -54171,7 +54171,7 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:917
+#: ../v2v/virt-v2v.pod:941
 msgid ""
 "The calling program should treat messages sent to stdout (except for "
 "progress bar messages) as status messages.  They can be logged and/or "
@@ -54855,7 +54855,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:399
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:423
 msgid "This disables progress bars and other unnecessary output."
 msgstr ""
 
@@ -55035,7 +55035,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:952
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:976
 msgid ""
 "Location of the temporary directory used for the potentially large temporary "
 "overlay file."
@@ -55049,7 +55049,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:955
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:979
 msgid ""
 "You should ensure there is enough free space in the worst case for a full "
 "copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -55057,7 +55057,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:959
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:983
 msgid "This defaults to C</tmp>."
 msgstr "Типовим значенням є C</tmp>."
 
@@ -55072,7 +55072,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:967
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:991
 #, no-wrap
 msgid ""
 " mount -o remount,size=10G /tmp\n"
@@ -88436,17 +88436,31 @@ msgstr ""
 #. type: =item
 #: ../v2v/virt-v2v.pod:164
 #, fuzzy
+#| msgid "B<--debug>"
+msgid "B<--debug-overlays>"
+msgstr "B<--debug>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:166
+msgid ""
+"Save the overlay file(s) created during conversion.  This option is only "
+"used for debugging virt-v2v and may be removed in a future version."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:170
+#, fuzzy
 #| msgid "B<gdisk>"
 msgid "B<-i disk>"
 msgstr "B<gdisk>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:172
 msgid "Set the input method to I<disk>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:174
 msgid ""
 "In this mode you can read a virtual machine disk image with no metadata.  "
 "virt-v2v tries to guess the best default metadata.  This is usually adequate "
@@ -88456,34 +88470,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
 msgid "B<-i libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:176
+#: ../v2v/virt-v2v.pod:182
 msgid "Set the input method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:184
 msgid ""
 "In this mode you have to specify a libvirt guest name or UUID on the command "
 "line.  You may also specify a libvirt connection URI (see I<-ic>)."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:188
 msgid "B<-i libvirtxml>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
 msgid "Set the input method to I<libvirtxml>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
 msgid ""
 "In this mode you have to pass a libvirt XML file on the command line.  This "
 "file is read in order to get metadata about the source guest (such as its "
@@ -88492,31 +88506,31 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:197
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-i local>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:199
 msgid "This is the same as I<-i disk>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:201
 #, fuzzy
 #| msgid "B<-i>"
 msgid "B<-i ova>"
 msgstr "B<-i>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:203
 msgid "Set the input method to I<ova>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:199
+#: ../v2v/virt-v2v.pod:205
 msgid ""
 "In this mode you can read a VMware ova file.  Virt-v2v will read the ova "
 "manifest file and check the vmdk volumes for validity (checksums)  as well "
@@ -88524,19 +88538,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
 msgid "B<-ic> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:211
 msgid ""
 "Specify a libvirt connection URI to use when reading the guest.  This is "
 "only used when S<I<-i libvirt>>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:208
+#: ../v2v/virt-v2v.pod:214
 msgid ""
 "Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
 "connections can be used.  Other remote libvirt connections will not work in "
@@ -88544,54 +88558,54 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
 msgid ""
 "See also L</INPUT FROM VMWARE VCENTER SERVER>, L</INPUT FROM RHEL 5 XEN> "
 "below."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:221
 #, fuzzy
 #| msgid "B<--format>"
 msgid "B<-if> format"
 msgstr "B<--format>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
 msgid ""
 "For I<-i disk> only, this specifies the format of the input disk image.  For "
 "other input methods you should specify the input format in the metadata."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
 #, fuzzy
 #| msgid "B<--network>"
 msgid "B<--network> in:out"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:235
 #, fuzzy
 #| msgid "B<--network>"
 msgid "B<--network> out"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
 msgid "B<--bridge> in:out"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:239
 #, fuzzy
 #| msgid "B<--merge>"
 msgid "B<--bridge> out"
 msgstr "B<--merge>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:241
 msgid ""
 "Map network (or bridge) called C<in> to network (or bridge) called C<out>.  "
 "If no C<in:> prefix is given, all other networks (or bridges)  are mapped to "
@@ -88599,21 +88613,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:245
 #, fuzzy
 #| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
 msgid "See L</NETWORKS AND BRIDGES> below."
 msgstr "Див. L</OPENING DISKS FOR READ AND WRITE> нижче."
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:241
+#: ../v2v/virt-v2v.pod:247
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "B<--no-copy>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:249
 msgid ""
 "Don't copy the disks.  Instead, conversion is performed (and thrown away), "
 "and metadata is written, but no disks are created.  See also discussion of "
@@ -88621,7 +88635,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
 msgid ""
 "This is useful in two cases: Either you want to test if conversion is likely "
 "to succeed, without the long copying process.  Or you are only interested in "
@@ -88629,40 +88643,77 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
 msgid ""
 "This option is not compatible with I<-o libvirt> since it would create a "
 "faulty guest (one with no disks)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:260
 msgid "This option is not compatible with I<-o glance> for technical reasons."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:262
+#, fuzzy
+#| msgid "B<--no-title>"
+msgid "B<--no-trim all>"
+msgstr "B<--no-title>"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:264
+msgid "B<--no-trim> mp[,mp...]"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:266
+msgid ""
+"By default virt-v2v runs L<fstrim(8)> to reduce the amount of data that "
+"needs to be copied.  This is known to break some buggy bootloaders causing "
+"boot failures after conversion (see for example L<https://bugzilla.redhat."
+"com/show_bug.cgi?id=1141145#c27>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:271
+msgid ""
+"You can use I<--no-trim all> to disable all trimming.  Note this will "
+"greatly increase the amount of data that has to be copied and can make virt-"
+"v2v run much more slowly."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:275
+msgid ""
+"You can also disable trimming on selected filesystems only (specified by a "
+"comma-separated list of their mount point(s) in the guest).  Typically you "
+"would use I<--no-trim /boot> to work around the grub bug mentioned above."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:280
 #, fuzzy
 #| msgid "B<gdisk>"
 msgid "B<-o disk>"
 msgstr "B<gdisk>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:282
 #, fuzzy
 #| msgid "This is the default."
 msgid "This is the same as I<-o local>."
 msgstr "Типове значення."
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:284
 #, fuzzy
 #| msgid "B<-o kernel_cache>"
 msgid "B<-o glance>"
 msgstr "B<-o kernel_cache>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:286
 msgid ""
 "Set the output method to OpenStack Glance.  In this mode the converted guest "
 "is uploaded to Glance.  You can control the image name by setting the I<-on> "
@@ -88670,41 +88721,41 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:290
 msgid "B<-o libvirt>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:292
 msgid "Set the output method to I<libvirt>.  This is the default."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:294
 msgid ""
 "In this mode, the converted guest is created as a libvirt guest.  You may "
 "also specify a libvirt connection URI (see I<-oc>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:297
 #, fuzzy
 #| msgid "see L</1 MB PARTITION ALIGNMENT> below."
 msgid "See L</OUTPUT TO LIBVIRT> below."
 msgstr "див. L</ВИРІВНЮВАННЯ РОЗДІЛІВ НА ПОЗНАЧКИ 1 МБ> нижче."
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:299
 msgid "B<-o local>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:301
 msgid "Set the output method to I<local>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:303
 msgid ""
 "In this mode, the converted guest is written to a local directory specified "
 "by I<-os /dir> (the directory must exist).  The converted guest's disks are "
@@ -88712,7 +88763,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
 #, no-wrap
 msgid ""
 " /dir/name-sda\n"
@@ -88722,12 +88773,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:311
 msgid "and a libvirt XML file is created containing guest metadata:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:313
 #, no-wrap
 msgid ""
 " /dir/name.xml\n"
@@ -88735,55 +88786,55 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:315
 msgid "where C<name> is the guest name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:317
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o null>"
 msgstr "B<-o параметр>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:319
 msgid "Set the output method to I<null>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:297
+#: ../v2v/virt-v2v.pod:321
 msgid ""
 "The guest is converted and copied (unless you also specify I<--no-copy>), "
 "but the results are thrown away and no metadata is written."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:325
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o ovirt>"
 msgstr "B<-o параметр>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
 msgid "This is the same as I<-o rhev>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:329
 #, fuzzy
 #| msgid "B<-o option>"
 msgid "B<-o qemu>"
 msgstr "B<-o параметр>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:331
 msgid "Set the output method to I<qemu>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:309
+#: ../v2v/virt-v2v.pod:333
 msgid ""
 "This is similar to I<-o local>, except that a shell script is written which "
 "you can use to boot the guest in qemu.  The converted disks and shell script "
@@ -88791,24 +88842,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:313
+#: ../v2v/virt-v2v.pod:337
 msgid ""
 "When using this output mode, you can also specify the I<--qemu-boot> option "
 "which boots the guest under qemu immediately."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:340
 msgid "B<-o rhev>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:318
+#: ../v2v/virt-v2v.pod:342
 msgid "Set the output method to I<rhev>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:320
+#: ../v2v/virt-v2v.pod:344
 msgid ""
 "The converted guest is written to a RHEV Export Storage Domain.  The I<-os> "
 "parameter must also be used to specify the location of the Export Storage "
@@ -88817,118 +88868,118 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:325
+#: ../v2v/virt-v2v.pod:349
 #, fuzzy
 #| msgid "B<gdisk>"
 msgid "B<-o vdsm>"
 msgstr "B<gdisk>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
 msgid "Set the output method to I<vdsm>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:353
 msgid ""
 "This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
 "runs virt-v2v under VDSM control."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
 msgid "B<-oa sparse>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
 msgid "B<-oa preallocated>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
 msgid "Set the output file allocation mode.  The default is C<sparse>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:362
 msgid "B<-oc> libvirtURI"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
 msgid ""
 "Specify a libvirt connection to use when writing the converted guest.  This "
 "is only used when S<I<-o libvirt>>.  See L</OUTPUT TO LIBVIRT> below."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:367
 msgid ""
 "Only local libvirt connections can be used.  Remote libvirt connections will "
 "not work."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
 msgid "B<-of> format"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
 msgid "When converting the guest, convert the disks to the given format."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
 msgid "If not specified, then the input format is used."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
 msgid "B<-on> name"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:378
 msgid ""
 "Rename the guest when converting it.  If this option is not used then the "
 "output name is the same as the input name."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
 msgid "B<-os> storage"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:359
+#: ../v2v/virt-v2v.pod:383
 msgid "The location of the storage for the converted guest."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:385
 msgid ""
 "For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
 "list>>) or pool UUID."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:364
+#: ../v2v/virt-v2v.pod:388
 msgid ""
 "For I<-o local> and I<-o qemu>, this is a directory name.  The directory "
 "must exist."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:367
+#: ../v2v/virt-v2v.pod:391
 msgid ""
 "For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
 "form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:370
+#: ../v2v/virt-v2v.pod:394
 #, no-wrap
 msgid ""
 " rhev-storage.example.com:/rhev/export\n"
@@ -88936,7 +88987,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:372
+#: ../v2v/virt-v2v.pod:396
 msgid ""
 "The NFS export must be mountable and writable by the user and host running "
 "virt-v2v, since the virt-v2v program has to actually mount it when it runs.  "
@@ -88944,7 +88995,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:400
 msgid ""
 "B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
 "the mountpoint.  Note that virt-v2v will still need to write to this remote "
@@ -88952,21 +89003,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:381
+#: ../v2v/virt-v2v.pod:405
 msgid ""
 "You will get an error if virt-v2v is unable to mount/write to the Export "
 "Storage Domain."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:408
 #, fuzzy
 #| msgid "B<--print-cache>"
 msgid "B<--print-source>"
 msgstr "B<--print-cache>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:410
 msgid ""
 "Print information about the source guest and stop.  This option is useful "
 "when you are setting up network and bridge maps.  See L</NETWORKS AND "
@@ -88974,51 +89025,51 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:390
+#: ../v2v/virt-v2v.pod:414
 #, fuzzy
 #| msgid "B<--quiet>"
 msgid "B<--qemu-boot>"
 msgstr "B<--quiet>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:416
 msgid ""
 "When using I<-o qemu> only, this boots the guest immediately after virt-v2v "
 "finishes."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
 msgid "B<--root ask>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:427
 msgid "B<--root single>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:429
 msgid "B<--root first>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:431
 msgid "B<--root> /dev/sdX"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:433
 msgid "B<--root> /dev/VG/LV"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:435
 msgid "Choose the root filesystem to be converted."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
 msgid ""
 "In the case where the virtual machine is dual-boot or multi-boot, or where "
 "the VM has other filesystems that look like operating systems, this option "
@@ -89029,14 +89080,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:421
+#: ../v2v/virt-v2v.pod:445
 msgid ""
 "The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
 "virt-v2v to die if a multi-boot operating system is found."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:424
+#: ../v2v/virt-v2v.pod:448
 msgid ""
 "Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
 "found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -89045,7 +89096,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:453
 msgid ""
 "S<I<--root first>> means to choose the first root device in the case of a "
 "multi-boot operating system.  Since this is a heuristic, it may sometimes "
@@ -89053,7 +89104,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:457
 msgid ""
 "You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
 "mean to use the second partition on the first hard drive.  If the named root "
@@ -89062,7 +89113,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:462
 msgid ""
 "Note that there is a bug in grub which prevents it from successfully booting "
 "a multiboot system if VirtIO is enabled.  Grub is only able to boot an "
@@ -89072,28 +89123,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-image-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:470
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-vol-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
 #, fuzzy
 #| msgid "B<lvm-uuids> *"
 msgid "B<--vdsm-vm-uuid> UUID"
 msgstr "B<lvm-uuids> *"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
 msgid ""
 "Normally the RHEV output mode chooses random UUIDs for the target guest.  "
 "However VDSM needs to control the UUIDs and passes these parameters when "
@@ -89101,48 +89152,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
 msgid "the image directory (I<--vdsm-image-uuid>)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:463
+#: ../v2v/virt-v2v.pod:487
 msgid ""
 "UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
 "for each guest disk)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:468
+#: ../v2v/virt-v2v.pod:492
 msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:496
 msgid ""
 "The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
 "digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:499
 msgid "These options can only be used with I<-o vdsm>."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:513
 msgid "B<--vmtype desktop>"
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:491
+#: ../v2v/virt-v2v.pod:515
 #, fuzzy
 #| msgid "B<--merge>"
 msgid "B<--vmtype server>"
 msgstr "B<--merge>"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:517
 msgid ""
 "For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest.  "
 "You can set this to C<desktop> or C<server>.  If the option is not given, "
@@ -89151,12 +89202,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:504
+#: ../v2v/virt-v2v.pod:528
 msgid "XEN PARAVIRTUALIZED GUESTS"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:530
 msgid ""
 "Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
 "a KVM guest by installing a new kernel.  This version of virt-v2v does "
@@ -89165,7 +89216,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:535
 msgid ""
 "Therefore before conversion you should check that a regular kernel is "
 "installed.  For some older Linux distributions, this means installing a "
@@ -89173,7 +89224,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:515
+#: ../v2v/virt-v2v.pod:539
 #, no-wrap
 msgid ""
 " RHEL 3         (Does not apply, as there was no Xen PV kernel)\n"
@@ -89181,7 +89232,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:541
 #, no-wrap
 msgid ""
 " RHEL 4         i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -89194,7 +89245,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:548
 #, no-wrap
 msgid ""
 " RHEL 5         i686: install 'kernel-PAE'\n"
@@ -89203,7 +89254,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:527
+#: ../v2v/virt-v2v.pod:551
 #, no-wrap
 msgid ""
 " SLES 10        i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -89215,7 +89266,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:557
 #, no-wrap
 msgid ""
 " SLES 11+       i586: install 'kernel-pae'\n"
@@ -89224,7 +89275,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:536
+#: ../v2v/virt-v2v.pod:560
 #, no-wrap
 msgid ""
 " Windows        (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -89232,19 +89283,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:562
 msgid "ENABLING VIRTIO"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:564
 msgid ""
 "\"Virtio\" is the name for a set of drivers which make disk (block device), "
 "network and other guest operations work much faster on KVM."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:567
 msgid ""
 "Older versions of virt-v2v could install these drivers for certain Linux "
 "guests.  This version of virt-v2v does I<not> attempt to install new Linux "
@@ -89252,7 +89303,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:548
+#: ../v2v/virt-v2v.pod:572
 msgid ""
 "In order to enable virtio, and hence improve performance of the guest after "
 "conversion, you should ensure that the B<minimum> versions of packages are "
@@ -89260,7 +89311,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:553
+#: ../v2v/virt-v2v.pod:577
 #, no-wrap
 msgid ""
 " RHEL 3         No virtio drivers are available\n"
@@ -89268,7 +89319,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:555
+#: ../v2v/virt-v2v.pod:579
 #, no-wrap
 msgid ""
 " RHEL 4         kernel >= 2.5.9-89.EL\n"
@@ -89276,7 +89327,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:581
 #, no-wrap
 msgid ""
 " RHEL 5         kernel >= 2.6.18-128.el5\n"
@@ -89286,7 +89337,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:585
 #, no-wrap
 msgid ""
 " RHEL 6+        All versions support virtio\n"
@@ -89294,7 +89345,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:587
 #, no-wrap
 msgid ""
 " Fedora         All versions support virtio\n"
@@ -89302,7 +89353,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:589
 #, no-wrap
 msgid ""
 " SLES 11+       All versions support virtio\n"
@@ -89310,7 +89361,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:591
 #, no-wrap
 msgid ""
 " SLES 10        kernel >= 2.6.16.60-0.85.1\n"
@@ -89318,7 +89369,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:569
+#: ../v2v/virt-v2v.pod:593
 #, no-wrap
 msgid ""
 " OpenSUSE 11+   All versions support virtio\n"
@@ -89326,7 +89377,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:571
+#: ../v2v/virt-v2v.pod:595
 #, no-wrap
 msgid ""
 " OpenSUSE 10    kernel >= 2.6.25.5-1.1\n"
@@ -89334,7 +89385,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:597
 #, no-wrap
 msgid ""
 " Windows        Drivers are installed from /usr/share/virtio-win\n"
@@ -89343,12 +89394,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:576
+#: ../v2v/virt-v2v.pod:600
 msgid "NETWORKS AND BRIDGES"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:602
 msgid ""
 "Guests are usually connected to one or more networks, and when converted to "
 "the target hypervisor you usually want to reconnect those networks at the "
@@ -89356,7 +89407,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:607
 msgid ""
 "If you are unsure of what networks and bridges are in use on the source "
 "hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -89366,14 +89417,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:613
 msgid ""
 "In the I<--print-source> output you will see a section showing the guest's "
 "Network Interface Cards (NICs):"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:616
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -89384,21 +89435,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:597
+#: ../v2v/virt-v2v.pod:621
 msgid ""
 "This is typical of a libvirt guest: It has a single network interface "
 "connected to a network called C<default>."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:624
 msgid ""
 "To map a specific network to a target network, for example C<default> on the "
 "source to C<rhevm> on the target, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:627
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network default:rhevm\n"
@@ -89406,12 +89457,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:629
 msgid "To map every network to a target network, use:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:631
 #, no-wrap
 msgid ""
 " virt-v2v [...] --network rhevm\n"
@@ -89419,14 +89470,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:609
+#: ../v2v/virt-v2v.pod:633
 msgid ""
 "Bridges are handled in the same way, but you have to use the I<--bridge> "
 "option instead.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:612
+#: ../v2v/virt-v2v.pod:636
 #, no-wrap
 msgid ""
 " $ virt-v2v [-i ...] --print-source name\n"
@@ -89437,7 +89488,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:617
+#: ../v2v/virt-v2v.pod:641
 #, no-wrap
 msgid ""
 " $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -89445,23 +89496,23 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:619
+#: ../v2v/virt-v2v.pod:643
 msgid "INPUT FROM VMWARE VCENTER SERVER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:621
+#: ../v2v/virt-v2v.pod:645
 msgid "Virt-v2v is able to import guests from VMware vCenter Server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:623
+#: ../v2v/virt-v2v.pod:647
 msgid ""
 "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:626
+#: ../v2v/virt-v2v.pod:650
 msgid ""
 "Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
 "should be I<-i libvirt>.  As this is the default, you don't need to specify "
@@ -89469,12 +89520,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:630
+#: ../v2v/virt-v2v.pod:654
 msgid "The libvirt URI of a vCenter server looks something like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:656
 #, no-wrap
 msgid ""
 " vpx://user@server/Datacenter/esxi\n"
@@ -89482,7 +89533,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:658
 msgid ""
 "where C<user@> is the (optional, but recommended) user to connect as, "
 "C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -89491,25 +89542,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:663
 msgid ""
 "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:641
+#: ../v2v/virt-v2v.pod:665
 msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:667
 msgid ""
 "Use the L<virsh(1)> command to list the guests on the vCenter Server like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:670
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -89518,7 +89569,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:649
+#: ../v2v/virt-v2v.pod:673
 #, no-wrap
 msgid ""
 "  Id    Name                           State\n"
@@ -89529,7 +89580,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:678
 msgid ""
 "If you get an error \"Peer certificate cannot be authenticated with given CA "
 "certificates\" or similar, then you can either import the ESX host's "
@@ -89538,7 +89589,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:683
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -89546,14 +89597,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:661 ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:685 ../v2v/virt-v2v.pod:753
 msgid ""
 "You should also try dumping the metadata from any guest on your server, like "
 "this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:688
 #, no-wrap
 msgid ""
 " $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -89565,7 +89616,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:694
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -89573,17 +89624,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:674
+#: ../v2v/virt-v2v.pod:698
 msgid "ESX: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:700
 msgid "To import a particular guest from vCenter Server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:678
+#: ../v2v/virt-v2v.pod:702
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -89593,13 +89644,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:706
 msgid ""
 "where C<Windows 2003> is the name of the guest (which must be shut down)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:709
 msgid ""
 "Note that you may be asked for the vCenter password I<twice>.  This happens "
 "once because libvirt needs it, and a second time because virt-v2v itself "
@@ -89607,7 +89658,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:689 ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:713 ../v2v/virt-v2v.pod:777
 msgid ""
 "In this case the output flags are set to write the converted guest to a "
 "temporary directory as this is just an example, but you can also write to "
@@ -89615,17 +89666,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:717
 msgid "INPUT FROM RHEL 5 XEN"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:695
+#: ../v2v/virt-v2v.pod:719
 msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:721
 msgid ""
 "Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
 "input mode should be I<-i libvirt>.  As this is the default, you don't need "
@@ -89633,33 +89684,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:701
+#: ../v2v/virt-v2v.pod:725
 msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:727
 msgid ""
 "Currently you must enable passwordless SSH access to the remote Xen host "
 "from the virt-v2v conversion server."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:730
 msgid ""
 "You must also use ssh-agent, and add your ssh public key to C</root/.ssh/"
 "authorized_keys> (on the Xen host)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:709
+#: ../v2v/virt-v2v.pod:733
 msgid ""
 "After doing this, you should check that passwordless access works from the "
 "virt-v2v server to the Xen host.  For example:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:736
 #, no-wrap
 msgid ""
 " $ ssh root at xen.example.com\n"
@@ -89668,24 +89719,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:715
+#: ../v2v/virt-v2v.pod:739
 msgid ""
 "Note that password-interactive and Kerberos access are B<not> supported.  "
 "You B<have> to set up ssh access using ssh-agent and authorized_keys."
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:719
+#: ../v2v/virt-v2v.pod:743
 msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:745
 msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:747
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -89697,7 +89748,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:756
 #, no-wrap
 msgid ""
 " $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -89709,7 +89760,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:762
 msgid ""
 "B<If the above commands do not work, then virt-v2v is not going to work "
 "either>.  Fix your libvirt configuration or the remote server before "
@@ -89717,17 +89768,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../v2v/virt-v2v.pod:742
+#: ../v2v/virt-v2v.pod:766
 msgid "XEN: IMPORTING A GUEST"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:744
+#: ../v2v/virt-v2v.pod:768
 msgid "To import a particular guest from a Xen server, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:746
+#: ../v2v/virt-v2v.pod:770
 #, no-wrap
 msgid ""
 " $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -89737,58 +89788,58 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:750
+#: ../v2v/virt-v2v.pod:774
 msgid ""
 "where C<rhel49-x86_64-pv> is the name of the guest (which must be shut down)."
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:781
 msgid "OUTPUT TO LIBVIRT"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:783
 msgid ""
 "The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
 "managed host.  There are several limitations:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:766
+#: ../v2v/virt-v2v.pod:790
 msgid ""
 "You can only use a local libvirt connection [see below for how to workaround "
 "this]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:795
 msgid ""
 "The I<-os pool> option must specify a directory pool, not anything more "
 "exotic such as iSCSI [but see below]."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:776
+#: ../v2v/virt-v2v.pod:800
 msgid "You can only upload to a KVM hypervisor."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:780
+#: ../v2v/virt-v2v.pod:804
 msgid ""
 "B<To output to a remote libvirt instance and/or a non-directory storage "
 "pool> you have to use the following workaround:"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:787
+#: ../v2v/virt-v2v.pod:811
 msgid ""
 "Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
 "into a local temporary directory:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:814
 #, fuzzy, no-wrap
 #| msgid ""
 #| " virt-builder fedora-20 -o mydisk.img\n"
@@ -89801,14 +89852,14 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:816
 #, fuzzy
 #| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgid "This creates two (or more) files in C</var/tmp> called:"
 msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:794
+#: ../v2v/virt-v2v.pod:818
 #, no-wrap
 msgid ""
 " /var/tmp/NAME.xml     # the libvirt XML (metadata)\n"
@@ -89817,17 +89868,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:821
 msgid "(for C<NAME> substitute the guest's name)."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:801
+#: ../v2v/virt-v2v.pod:825
 msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:803
+#: ../v2v/virt-v2v.pod:827
 #, no-wrap
 msgid ""
 " size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -89837,14 +89888,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:809
+#: ../v2v/virt-v2v.pod:833
 msgid ""
 "Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name.  "
 "In other words, locate the following bit of XML:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:836
 #, no-wrap
 msgid ""
 " <disk type='file' device='disk'>\n"
@@ -89856,7 +89907,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:842
 msgid ""
 "and change two things: The C<type='file'> attribute must be changed to "
 "C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -89864,7 +89915,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:822
+#: ../v2v/virt-v2v.pod:846
 #, no-wrap
 msgid ""
 " <disk type='volume' device='disk'>\n"
@@ -89876,12 +89927,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:830
+#: ../v2v/virt-v2v.pod:854
 msgid "Define the final guest in libvirt:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:832
+#: ../v2v/virt-v2v.pod:856
 #, no-wrap
 msgid ""
 " virsh define /var/tmp/NAME.xml\n"
@@ -89889,19 +89940,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:860
 msgid "MINIMAL XML FOR -i libvirtxml OPTION"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:838
+#: ../v2v/virt-v2v.pod:862
 msgid ""
 "When using the I<-i libvirtxml> option, you have to supply some libvirt "
 "XML.  Writing this from scratch is hard, so the template below is helpful."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:866
 msgid ""
 "B<Note this should only be used for testing and/or where you know what "
 "you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -89909,7 +89960,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:846
+#: ../v2v/virt-v2v.pod:870
 #, no-wrap
 msgid ""
 " <domain type='kvm'>\n"
@@ -89942,7 +89993,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:875
+#: ../v2v/virt-v2v.pod:899
 msgid ""
 "The I<--machine-readable> option can be used to make the output more machine "
 "friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -89950,14 +90001,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:905
 msgid ""
 "Firstly use the option on its own to query the capabilities of the virt-v2v "
 "binary.  Typical output looks like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../v2v/virt-v2v.pod:884
+#: ../v2v/virt-v2v.pod:908
 #, no-wrap
 msgid ""
 " $ virt-v2v --machine-readable\n"
@@ -89973,7 +90024,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:921
 msgid ""
 "The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
 "output mode) options supported by this binary.  The C<convert:> features "
@@ -89981,7 +90032,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:923
+#: ../v2v/virt-v2v.pod:947
 msgid ""
 "The calling program should treat messages sent to stderr as error messages.  "
 "In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -89989,36 +90040,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:929
+#: ../v2v/virt-v2v.pod:953
 msgid ""
 "Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
 "all.  The option was added when virt-v2v was rewritten in 2014."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:960
 msgid "C</usr/share/virtio-win>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:938 ../v2v/virt-v2v.pod:992
+#: ../v2v/virt-v2v.pod:962 ../v2v/virt-v2v.pod:1016
 msgid "(Optional)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:940
+#: ../v2v/virt-v2v.pod:964
 msgid ""
 "If this directory is present, then virtio drivers for Windows guests will be "
 "found from this directory and installed in the guest during conversion."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:974
 msgid "C<TMPDIR>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:961
+#: ../v2v/virt-v2v.pod:985
 msgid ""
 "Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
 "use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
@@ -90028,31 +90079,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:995
 msgid ""
 "This can point to the directory containing data files used for Windows "
 "conversion."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:1007
 msgid "(Required when doing conversions of Windows guests)"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:985
+#: ../v2v/virt-v2v.pod:1009
 msgid ""
 "This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
 "in the guest during conversion of Windows guests."
 msgstr ""
 
 #. type: =item
-#: ../v2v/virt-v2v.pod:990
+#: ../v2v/virt-v2v.pod:1014
 msgid "C<rhev-apt.exe>"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:1018
 msgid ""
 "The RHEV Application Provisioning Tool (RHEV APT).  If this file is present, "
 "then RHEV APT will be installed in the Windows guest during conversion.  "
@@ -90062,14 +90113,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1000
+#: ../v2v/virt-v2v.pod:1024
 msgid ""
 "This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
 "distributed with virt-v2v."
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1011
+#: ../v2v/virt-v2v.pod:1035
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
@@ -90078,24 +90129,24 @@ msgstr ""
 msgid ""
 "L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
 "L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
-"L<qemu-img(1)>, L<http://libguestfs.org/>."
+"L<qemu-img(1)>, L<fstrim(8)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-list-"
 "filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
 "libguestfs.org/>."
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1053
 msgid "Mike Latimer"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1055
 msgid "Shahar Havivi"
 msgstr ""
 
 #. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1057
 msgid "Tingting Zheng"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 083ee57..f77509b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 0e8b99e..4d6f12f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -607,14 +607,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -648,19 +656,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -668,19 +676,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -697,47 +705,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -779,7 +787,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -820,7 +828,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +842,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,11 +854,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -870,7 +878,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,7 +906,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -934,7 +942,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -986,7 +994,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1024,6 +1032,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1063,7 +1075,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1074,7 +1086,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1082,7 +1094,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1094,7 +1106,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1182,7 +1194,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1247,7 +1259,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1267,7 +1279,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1277,11 +1289,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1301,7 +1313,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1309,7 +1321,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1324,7 +1336,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1333,7 +1345,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1341,15 +1353,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1416,7 +1428,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1432,7 +1444,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1440,10 +1452,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1479,11 +1495,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1670,7 +1686,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1738,6 +1754,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1774,7 +1794,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1804,7 +1824,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1816,15 +1836,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1872,7 +1892,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2070,13 +2090,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2274,7 +2294,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2288,7 +2308,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2359,7 +2379,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2399,7 +2419,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2463,19 +2483,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2589,15 +2609,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2609,7 +2629,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2629,7 +2649,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2678,7 +2698,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2688,7 +2708,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2738,7 +2758,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2781,7 +2801,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2793,7 +2813,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2852,15 +2872,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2868,7 +2888,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2890,7 +2910,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2909,23 +2929,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3105,7 +3125,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 420cc7d..1d4b2e1 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -606,14 +606,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -647,19 +655,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -667,19 +675,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -696,47 +704,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -778,7 +786,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -819,7 +827,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -833,7 +841,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -845,11 +853,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -869,7 +877,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -897,7 +905,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -933,7 +941,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -985,7 +993,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1023,6 +1031,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1062,7 +1074,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1073,7 +1085,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1081,7 +1093,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1093,7 +1105,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1181,7 +1193,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1246,7 +1258,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1266,7 +1278,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1276,11 +1288,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1308,7 +1320,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1323,7 +1335,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1332,7 +1344,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1340,15 +1352,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1407,7 +1419,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1431,7 +1443,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1439,10 +1451,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1478,11 +1494,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1669,7 +1685,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1737,6 +1753,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1773,7 +1793,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1803,7 +1823,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1815,15 +1835,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1871,7 +1891,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2069,13 +2089,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2273,7 +2293,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2287,7 +2307,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2358,7 +2378,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2398,7 +2418,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2462,19 +2482,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2588,15 +2608,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2608,7 +2628,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2628,7 +2648,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2677,7 +2697,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2687,7 +2707,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2737,7 +2757,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2780,7 +2800,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2792,7 +2812,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2851,15 +2871,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2867,7 +2887,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2889,7 +2909,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2908,23 +2928,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3104,7 +3124,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 22a098f..5728b54 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -606,14 +606,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -647,19 +655,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -667,19 +675,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -696,47 +704,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -778,7 +786,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -819,7 +827,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -833,7 +841,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -845,11 +853,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -869,7 +877,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -897,7 +905,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -933,7 +941,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -985,7 +993,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1023,6 +1031,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1062,7 +1074,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1073,7 +1085,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1081,7 +1093,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1093,7 +1105,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1181,7 +1193,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1246,7 +1258,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1266,7 +1278,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1276,11 +1288,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1308,7 +1320,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1323,7 +1335,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1332,7 +1344,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1340,15 +1352,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1407,7 +1419,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1431,7 +1443,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1439,10 +1451,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1478,11 +1494,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1669,7 +1685,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1737,6 +1753,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1773,7 +1793,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1803,7 +1823,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1815,15 +1835,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1871,7 +1891,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2069,13 +2089,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2273,7 +2293,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2287,7 +2307,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2358,7 +2378,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2398,7 +2418,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2462,19 +2482,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2588,15 +2608,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2608,7 +2628,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2628,7 +2648,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2677,7 +2697,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2687,7 +2707,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2737,7 +2757,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2780,7 +2800,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2792,7 +2812,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2851,15 +2871,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2867,7 +2887,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2889,7 +2909,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2908,23 +2928,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3104,7 +3124,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index f9a3a96..26c8af6 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 0c2680f..57120fb 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.27.54\n"
+"Project-Id-Version: libguestfs 1.27.55\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -104,7 +104,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -604,14 +604,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -645,19 +653,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -665,19 +673,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -694,47 +702,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -776,7 +784,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -817,7 +825,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -831,7 +839,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -843,11 +851,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -867,7 +875,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -895,7 +903,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -931,7 +939,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -983,7 +991,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1021,6 +1029,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1060,7 +1072,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1071,7 +1083,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1079,7 +1091,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1091,7 +1103,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1244,7 +1256,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1264,7 +1276,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1274,11 +1286,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1298,7 +1310,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1306,7 +1318,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1321,7 +1333,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1330,7 +1342,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1338,15 +1350,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1405,7 +1417,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1413,7 +1425,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1429,7 +1441,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1437,10 +1449,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1476,11 +1492,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1667,7 +1683,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1735,6 +1751,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1771,7 +1791,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1801,7 +1821,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1813,15 +1833,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1869,7 +1889,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2067,13 +2087,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2271,7 +2291,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2285,7 +2305,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2356,7 +2376,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2396,7 +2416,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2460,19 +2480,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2586,15 +2606,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2606,7 +2626,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2626,7 +2646,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2675,7 +2695,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2685,7 +2705,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2735,7 +2755,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2778,7 +2798,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2790,7 +2810,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2849,15 +2869,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2865,7 +2885,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2887,7 +2907,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2906,23 +2926,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3102,7 +3122,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 3d24a3e..93ae8c4 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index f4ffbde..a0f3679 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -606,14 +606,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -647,19 +655,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -667,19 +675,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -696,47 +704,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -778,7 +786,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -819,7 +827,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -833,7 +841,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -845,11 +853,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -869,7 +877,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -897,7 +905,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -933,7 +941,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -985,7 +993,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1023,6 +1031,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1062,7 +1074,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1073,7 +1085,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1081,7 +1093,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1093,7 +1105,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1181,7 +1193,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1246,7 +1258,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1266,7 +1278,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1276,11 +1288,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1308,7 +1320,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1323,7 +1335,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1332,7 +1344,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1340,15 +1352,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1407,7 +1419,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1431,7 +1443,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1439,10 +1451,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1478,11 +1494,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1669,7 +1685,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1737,6 +1753,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1773,7 +1793,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1803,7 +1823,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1815,15 +1835,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1871,7 +1891,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2069,13 +2089,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2273,7 +2293,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2287,7 +2307,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2358,7 +2378,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2398,7 +2418,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2462,19 +2482,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2588,15 +2608,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2608,7 +2628,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2628,7 +2648,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2677,7 +2697,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2687,7 +2707,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2737,7 +2757,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2780,7 +2800,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2792,7 +2812,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2851,15 +2871,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2867,7 +2887,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2889,7 +2909,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2908,23 +2928,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3104,7 +3124,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 79c232b..a43b2bf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -607,14 +607,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -648,19 +656,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -668,19 +676,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -697,47 +705,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -779,7 +787,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -820,7 +828,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +842,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,11 +854,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -870,7 +878,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,7 +906,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -934,7 +942,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -986,7 +994,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1024,6 +1032,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1063,7 +1075,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1074,7 +1086,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1082,7 +1094,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1094,7 +1106,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1182,7 +1194,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1247,7 +1259,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1267,7 +1279,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1277,11 +1289,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1301,7 +1313,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1309,7 +1321,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1324,7 +1336,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1333,7 +1345,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1341,15 +1353,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1416,7 +1428,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1432,7 +1444,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1440,10 +1452,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1479,11 +1495,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1670,7 +1686,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1738,6 +1754,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1774,7 +1794,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1804,7 +1824,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1816,15 +1836,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1872,7 +1892,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2070,13 +2090,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2274,7 +2294,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2288,7 +2308,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2359,7 +2379,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2399,7 +2419,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2463,19 +2483,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2589,15 +2609,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2609,7 +2629,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2629,7 +2649,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2678,7 +2698,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2688,7 +2708,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2738,7 +2758,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2781,7 +2801,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2793,7 +2813,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2852,15 +2872,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2868,7 +2888,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2890,7 +2910,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2909,23 +2929,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3105,7 +3125,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index 160d622..4ccedf6 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 74ac52a..6c6dc02 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -606,14 +606,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -647,19 +655,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -667,19 +675,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -696,47 +704,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -778,7 +786,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -819,7 +827,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -833,7 +841,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -845,11 +853,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -869,7 +877,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -897,7 +905,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -933,7 +941,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -985,7 +993,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1023,6 +1031,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1062,7 +1074,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1073,7 +1085,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1081,7 +1093,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1093,7 +1105,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1181,7 +1193,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1246,7 +1258,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1266,7 +1278,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1276,11 +1288,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1300,7 +1312,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1308,7 +1320,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1323,7 +1335,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1332,7 +1344,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1340,15 +1352,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1407,7 +1419,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1415,7 +1427,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1431,7 +1443,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1439,10 +1451,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1478,11 +1494,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1669,7 +1685,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1737,6 +1753,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1773,7 +1793,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1803,7 +1823,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1815,15 +1835,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1871,7 +1891,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2069,13 +2089,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2273,7 +2293,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2287,7 +2307,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2358,7 +2378,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2398,7 +2418,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2462,19 +2482,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2588,15 +2608,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2608,7 +2628,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2628,7 +2648,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2677,7 +2697,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2687,7 +2707,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2737,7 +2757,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2780,7 +2800,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2792,7 +2812,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2851,15 +2871,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2867,7 +2887,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2889,7 +2909,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2908,23 +2928,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3104,7 +3124,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index fcd9e21..ffe4113 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -609,14 +609,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -650,19 +658,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -670,19 +678,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -699,47 +707,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -781,7 +789,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -822,7 +830,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -836,7 +844,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -848,11 +856,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -872,7 +880,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -900,7 +908,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -936,7 +944,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -988,7 +996,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1026,6 +1034,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1065,7 +1077,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1076,7 +1088,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1084,7 +1096,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1096,7 +1108,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1184,7 +1196,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1249,7 +1261,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1269,7 +1281,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1279,11 +1291,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1303,7 +1315,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1311,7 +1323,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1326,7 +1338,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1335,7 +1347,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1343,15 +1355,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1410,7 +1422,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1418,7 +1430,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1434,7 +1446,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1442,10 +1454,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1481,11 +1497,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1672,7 +1688,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1740,6 +1756,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1806,7 +1826,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1818,15 +1838,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1874,7 +1894,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2072,13 +2092,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2276,7 +2296,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2290,7 +2310,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2361,7 +2381,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2421,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2465,19 +2485,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2591,15 +2611,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2611,7 +2631,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2651,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2680,7 +2700,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2690,7 +2710,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2740,7 +2760,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2783,7 +2803,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2795,7 +2815,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2854,15 +2874,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2870,7 +2890,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2892,7 +2912,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2911,23 +2931,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3107,7 +3127,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 8c9e7b4..8f1f955 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index f1a7b07..d15e8ba 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -605,14 +605,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -646,19 +654,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -666,19 +674,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -695,47 +703,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -777,7 +785,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -818,7 +826,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -832,7 +840,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -844,11 +852,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +876,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -896,7 +904,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -932,7 +940,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -984,7 +992,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1022,6 +1030,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1061,7 +1073,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1072,7 +1084,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1080,7 +1092,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1180,7 +1192,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1245,7 +1257,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1265,7 +1277,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1275,11 +1287,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1299,7 +1311,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1307,7 +1319,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1322,7 +1334,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1331,7 +1343,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1339,15 +1351,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1406,7 +1418,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1414,7 +1426,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1430,7 +1442,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1438,10 +1450,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1477,11 +1493,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1668,7 +1684,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1736,6 +1752,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1772,7 +1792,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1802,7 +1822,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1814,15 +1834,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1870,7 +1890,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2068,13 +2088,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2272,7 +2292,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2286,7 +2306,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2357,7 +2377,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2397,7 +2417,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2461,19 +2481,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2587,15 +2607,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2607,7 +2627,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2627,7 +2647,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2676,7 +2696,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2686,7 +2706,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2736,7 +2756,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2779,7 +2799,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2791,7 +2811,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2850,15 +2870,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2866,7 +2886,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2888,7 +2908,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2907,23 +2927,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3103,7 +3123,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index e352887..92ecb73 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-24 19:02+0100\n"
+"POT-Creation-Date: 2014-09-26 17:10+0100\n"
 "PO-Revision-Date: 2014-07-22 18:03+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
 msgid "%s"
 msgstr ""
 
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:428
 msgid "%s (ignored)"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgid ""
 "this out through the RHEV-M user interface."
 msgstr ""
 
-#: ../v2v/cmdline.ml:82 ../v2v/cmdline.ml:56
+#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
 msgid "%s option used more than once on the command line"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:255
+#: ../v2v/v2v.ml:258
 msgid "%s: %s (ignored)"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:185
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
@@ -607,14 +607,22 @@ msgstr ""
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../v2v/cmdline.ml:283
+#: ../v2v/cmdline.ml:309
 msgid "--no-copy and '-o glance' cannot be used at the same time"
 msgstr ""
 
-#: ../v2v/cmdline.ml:295
+#: ../v2v/cmdline.ml:321
 msgid "--no-copy and '-o libvirt' cannot be used at the same time"
 msgstr ""
 
+#: ../v2v/cmdline.ml:94
+msgid "--no-trim: %s: mountpoint does not begin with '/'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:92
+msgid "--no-trim: empty mountpoint"
+msgstr ""
+
 #: ../sysprep/main.ml:117
 msgid "--operations: '%s' is not a known operation"
 msgstr ""
@@ -648,19 +656,19 @@ msgstr ""
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../v2v/cmdline.ml:281
+#: ../v2v/cmdline.ml:307
 msgid "--vmtype option cannot be used with '-o glance'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:319
 msgid "--vmtype option cannot be used with '-o libvirt'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:333
 msgid "--vmtype option cannot be used with '-o local'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:318
+#: ../v2v/cmdline.ml:344
 msgid "--vmtype option cannot be used with '-o null'"
 msgstr ""
 
@@ -668,19 +676,19 @@ msgstr ""
 msgid "-i disk: invalid input filename (%s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:279
+#: ../v2v/cmdline.ml:305
 msgid "-o glance: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:301
 msgid "-o glance: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:277
+#: ../v2v/cmdline.ml:303
 msgid "-o glance: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:291
+#: ../v2v/cmdline.ml:317
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
@@ -697,47 +705,47 @@ msgid ""
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:331
 msgid "-o local: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:326
 msgid "-o local: output directory was not specified, use '-os /dir'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:316
+#: ../v2v/cmdline.ml:342
 msgid "-o null: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:312
+#: ../v2v/cmdline.ml:338
 msgid "-o null: -oc option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:314
+#: ../v2v/cmdline.ml:340
 msgid "-o null: -os option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:357
 msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:329
+#: ../v2v/cmdline.ml:355
 msgid "-o rhev: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:364
 msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:366
 msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
 msgstr ""
 
-#: ../v2v/cmdline.ml:336
+#: ../v2v/cmdline.ml:362
 msgid "-o vdsm: output storage was not specified, use '-os'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:323 ../v2v/cmdline.ml:302
+#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
@@ -779,7 +787,7 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../v2v/cmdline.ml:140
+#: ../v2v/cmdline.ml:164
 msgid "Boot in qemu (-o qemu only)"
 msgstr ""
 
@@ -820,7 +828,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:208
+#: ../v2v/v2v.ml:210
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +842,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:263
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,11 +854,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:225
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:221
+#: ../v2v/v2v.ml:223
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -870,7 +878,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:280
+#: ../v2v/v2v.ml:284
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,7 +906,7 @@ msgstr ""
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:335
+#: ../v2v/v2v.ml:339
 msgid "Creating output metadata"
 msgstr ""
 
@@ -934,7 +942,7 @@ msgstr ""
 msgid "Data Domain"
 msgstr ""
 
-#: ../v2v/cmdline.ml:124 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
 msgid "Debug GC and memory allocations"
 msgstr ""
 
@@ -986,7 +994,7 @@ msgstr ""
 #. ../customize/customize_main.ml:108
 #. ../builder/cmdline.ml:158
 #. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
 msgid "Display version and exit"
 msgstr ""
 
@@ -1024,6 +1032,10 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
+#: ../v2v/cmdline.ml:156
+msgid "Don't trim selected mounts"
+msgstr ""
+
 #: ../builder/cmdline.ml:114
 msgid "Download all templates to the cache"
 msgstr ""
@@ -1063,7 +1075,7 @@ msgstr ""
 #. ../customize/customize_main.ml:106
 #. ../builder/cmdline.ml:156
 #. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:148 ../sysprep/main.ml:147
+#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:148 ../sysprep/main.ml:147
 msgid "Enable debugging messages"
 msgstr ""
 
@@ -1074,7 +1086,7 @@ msgstr ""
 #. ../resize/resize.ml:215
 #. ../customize/customize_main.ml:110
 #. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:155 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
@@ -1082,7 +1094,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:371
+#: ../v2v/v2v.ml:386
 msgid "Enter number between 1 and %d: "
 msgstr ""
 
@@ -1094,7 +1106,7 @@ msgstr ""
 msgid "Error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/v2v.ml:212
+#: ../v2v/v2v.ml:214
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1182,7 +1194,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:338 ../customize/customize_main.ml:252
+#: ../v2v/v2v.ml:353 ../customize/customize_main.ml:252
 #: ../builder/builder.ml:711
 msgid "Finishing off"
 msgstr ""
@@ -1247,7 +1259,7 @@ msgstr ""
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:167
 msgid "How to choose root filesystem"
 msgstr ""
 
@@ -1267,7 +1279,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:159
+#: ../v2v/v2v.ml:161
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1277,11 +1289,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:151
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:195
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1301,7 +1313,7 @@ msgstr ""
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:155
 msgid "Just write the metadata"
 msgstr ""
 
@@ -1309,7 +1321,7 @@ msgstr ""
 msgid "Key: %s\n"
 msgstr ""
 
-#: ../v2v/cmdline.ml:135 ../v2v/cmdline.ml:126
+#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
 msgid "Libvirt URI"
 msgstr ""
 
@@ -1324,7 +1336,7 @@ msgstr ""
 #. ../resize/resize.ml:194
 #. ../customize/customize_main.ml:98
 #. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:129 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
 msgid "List long options"
 msgstr ""
 
@@ -1333,7 +1345,7 @@ msgid "List supported operations"
 msgstr ""
 
 #. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:130 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
 msgid "Make output machine readable"
 msgstr ""
 
@@ -1341,15 +1353,15 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:123
+#: ../v2v/cmdline.ml:142
 msgid "Map bridge 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/cmdline.ml:131
+#: ../v2v/cmdline.ml:154
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:250
+#: ../v2v/v2v.ml:252
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1408,7 +1420,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:129
+#: ../v2v/v2v.ml:131
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1416,7 +1428,7 @@ msgstr ""
 msgid "Opening the source %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:173
 msgid "Output VM UUID"
 msgstr ""
 
@@ -1432,7 +1444,7 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:169
 msgid "Output image UUID"
 msgstr ""
 
@@ -1440,10 +1452,14 @@ msgstr ""
 msgid "Output size"
 msgstr ""
 
-#: ../v2v/cmdline.ml:147
+#: ../v2v/cmdline.ml:171
 msgid "Output vol UUID(s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:349
+msgid "Overlay saved as %s [--debug-overlays]\n"
+msgstr ""
+
 #: ../customize/customize_cmdline.ml:140
 msgid "PATH"
 msgstr ""
@@ -1479,11 +1495,11 @@ msgstr ""
 msgid "Print info about template cache"
 msgstr ""
 
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:163
 msgid "Print source and stop"
 msgstr ""
 
-#: ../v2v/cmdline.ml:141 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
 msgid "Quiet output"
 msgstr ""
 
@@ -1670,7 +1686,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:137
+#: ../v2v/cmdline.ml:161
 msgid "Rename guest when converting"
 msgstr ""
 
@@ -1738,6 +1754,10 @@ msgstr ""
 msgid "SELinux relabelling"
 msgstr ""
 
+#: ../v2v/cmdline.ml:145
+msgid "Save overlay files"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:144
 msgid "Script or program to run on guest"
 msgstr ""
@@ -1774,7 +1794,7 @@ msgstr ""
 msgid "Set format (default: auto)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:125
+#: ../v2v/cmdline.ml:148
 msgid "Set input mode (default: libvirt)"
 msgstr ""
 
@@ -1804,7 +1824,7 @@ msgstr ""
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:158
 msgid "Set output allocation mode"
 msgstr ""
 
@@ -1816,15 +1836,15 @@ msgstr ""
 msgid "Set output filename"
 msgstr ""
 
-#: ../v2v/cmdline.ml:136
+#: ../v2v/cmdline.ml:160
 msgid "Set output format"
 msgstr ""
 
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:157
 msgid "Set output mode (default: libvirt)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:138
+#: ../v2v/cmdline.ml:162
 msgid "Set output storage location"
 msgstr ""
 
@@ -1872,7 +1892,7 @@ msgstr ""
 msgid "Set user password"
 msgstr ""
 
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:178
 msgid "Set vmtype (for RHEV)"
 msgstr ""
 
@@ -2070,13 +2090,13 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:244
 msgid ""
 "This guest does not have virtio drivers installed.\n"
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:242
 msgid ""
 "This guest has virtio drivers installed.\n"
 "%!"
@@ -2274,7 +2294,7 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:374
+#: ../v2v/v2v.ml:389
 msgid "connection closed"
 msgstr ""
 
@@ -2288,7 +2308,7 @@ msgid ""
 "'%s'.  Try running 'virsh define %s' yourself instead."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:408
+#: ../v2v/convert_windows.ml:411
 msgid ""
 "could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
@@ -2359,7 +2379,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:169
+#: ../v2v/v2v.ml:171
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2399,7 +2419,7 @@ msgstr ""
 msgid "don't know how to update %s which loads the %s module"
 msgstr ""
 
-#: ../v2v/v2v.ml:358
+#: ../v2v/v2v.ml:373
 msgid ""
 "dual- or multi-boot operating system detected. Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -2463,19 +2483,19 @@ msgstr ""
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
-#: ../v2v/cmdline.ml:237
+#: ../v2v/cmdline.ml:263
 msgid "expecting a disk image (filename) on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:258
+#: ../v2v/cmdline.ml:284
 msgid "expecting a libvirt XML file name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:249
+#: ../v2v/cmdline.ml:275
 msgid "expecting a libvirt guest name on the command line"
 msgstr ""
 
-#: ../v2v/cmdline.ml:267
+#: ../v2v/cmdline.ml:293
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
@@ -2589,15 +2609,15 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:296
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:123
+#: ../v2v/v2v.ml:125
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
-#: ../v2v/cmdline.ml:70
+#: ../v2v/cmdline.ml:71
 msgid "invalid --bridge or --network parameter"
 msgstr ""
 
@@ -2609,7 +2629,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:411
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2629,7 +2649,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:381
+#: ../v2v/v2v.ml:396
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2678,7 +2698,7 @@ msgstr ""
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:351
+#: ../v2v/v2v.ml:366
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2688,7 +2708,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:469
+#: ../v2v/v2v.ml:484
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2738,7 +2758,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:181
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2781,7 +2801,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:325 ../v2v/v2v.ml:119
+#: ../v2v/v2v.ml:329 ../v2v/v2v.ml:121
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2793,7 +2813,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:389
+#: ../v2v/v2v.ml:404
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2852,15 +2872,15 @@ msgstr ""
 msgid "there are no UUIDs in the %s (%s).  Is it really an OVirt or RHEV-M %s?"
 msgstr ""
 
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:266
 msgid ""
-"there are no virtio drivers available for this version of Windows (%d.%d "
+"there are no virtio drivers available for this version of Windows (%d.%d %s "
 "%s).  virt-v2v looks for drivers in %s\n"
 "\n"
 "The guest will be configured to use slower emulated devices."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:275
+#: ../v2v/convert_windows.ml:277
 msgid ""
 "there is no viostor (virtio block device) driver for this version of Windows "
 "(%d.%d %s).  virt-v2v looks for this driver here: %s\n"
@@ -2868,7 +2888,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/convert_windows.ml:292
+#: ../v2v/convert_windows.ml:294
 msgid ""
 "there is no virtio network driver for this version of Windows (%d.%d %s).  "
 "virt-v2v looks for this driver here: %s\n"
@@ -2890,7 +2910,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:408
+#: ../v2v/v2v.ml:423
 msgid ""
 "unable to mount the disk image for writing. This has probably happened "
 "because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2909,23 +2929,23 @@ msgstr ""
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:129
 msgid "unknown --root option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:240
 msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
 msgstr ""
 
-#: ../v2v/cmdline.ml:63
+#: ../v2v/cmdline.ml:64
 msgid "unknown -i option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:111
 msgid "unknown -o option: %s"
 msgstr ""
 
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:119
 msgid "unknown -oa option: %s"
 msgstr ""
 
@@ -3105,7 +3125,7 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 

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