[Pkg-libvirt-commits] [libguestfs] 122/179: Version 1.29.1.

Fri Oct 31 19:08:46 UTC 2014

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit fdaaa005136bf041e54a2e04006718641074221c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Oct 22 14:40:02 2014 +0100

    Version 1.29.1.
---
 BUGS                        | 140 ++++++++++++------------
 configure.ac                |   2 +-
 po-docs/libguestfs-docs.pot |   4 +-
 po/en_GB.po                 | 193 ++++++++++++++++++---------------
 po/es.po                    | 193 ++++++++++++++++++---------------
 po/gu.po                    | 193 ++++++++++++++++++---------------
 po/hi.po                    | 193 ++++++++++++++++++---------------
 po/kn.po                    | 193 ++++++++++++++++++---------------
 po/libguestfs.pot           | 195 ++++++++++++++++++---------------
 po/ml.po                    | 193 ++++++++++++++++++---------------
 po/mr.po                    | 193 ++++++++++++++++++---------------
 po/nl.po                    | 193 ++++++++++++++++++---------------
 po/or.po                    | 193 ++++++++++++++++++---------------
 po/pa.po                    | 193 ++++++++++++++++++---------------
 po/pl.po                    | 193 ++++++++++++++++++---------------
 po/ta.po                    | 193 ++++++++++++++++++---------------
 po/te.po                    | 193 ++++++++++++++++++---------------
 po/uk.po                    | 255 ++++++++++++++++++++++++++------------------
 18 files changed, 1752 insertions(+), 1353 deletions(-)

diff --git a/BUGS b/BUGS
index 4722d7e..f079201 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-10-18
+Last updated: 2014-10-22
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -161,9 +161,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 979392 NEW https://bugzilla.redhat.com/show_bug.cgi?id=979392
   [abrt] virt-manager crash from libguestfs launch_libvirt
 
-980790 NEW https://bugzilla.redhat.com/show_bug.cgi?id=980790
-  fstrim returns error "FITRIM ioctl failed: Inappropriate ioctl for device"
-
 982516 NEW https://bugzilla.redhat.com/show_bug.cgi?id=982516
   sh "rpm -Va" fails because apparently /dev/shm is not created/bind-mounted correctly
 
@@ -260,9 +257,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1076213 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1076213
   OpenStack as a v2v target.
 
-1076478 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1076478
-  FTBFS: libguestfs-1.22.6-15.el7
-
 1079625 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1079625
   virt-sparsify fails if a btrfs filesystem contains readonly snapshots
 
@@ -299,9 +293,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1100140 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100140
   some operation cause "lvremove" can not find the object
 
-1100528 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100528
-  These APIs also need to add to `guestfish -h` command list
-
 1100530 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1100530
   These APIs also need to add to `guestfish -h` command list
 
@@ -341,9 +332,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1118305 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1118305
   RFE: Ability to set iSCSI-Initiator-IQN for iSCSI connections
 
-1123221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123221
-  make xfs faield, "mkfs.xfs: No such file or directory"
-
 1128942 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1128942
   libguests tools failing on images containing a colon in the path
 
@@ -422,9 +410,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1151739 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151739
   typo error in man page of virt-edit
 
-1151897 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151897
-  virt-ls --checksum: checksum for soft link is wrong, the soft link have no checksum value output
-
 1151898 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151898
   virt-ls --checksum: checksum for soft link is wrong, the soft link have no checksum value output
 
@@ -467,18 +452,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1152833 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152833
   llz give ? for the security context of a file, which is wrong
 
-1152998 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152998
-  virt-v2v / qemu-img fails on ova image
-
-1153411 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153411
-  copy-in and copy-out copy symbolic link file problems, it only copy the link property not the real file
-
 1153412 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153412
   copy-in and copy-out copy symbolic link file problems, it only copy the link property not the real file
 
-1153589 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153589
-  virt-v2v will hang when converting esx guest before disk copy phase
-
 1153702 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153702
   Using "upload - XXX" doesn't work with remote
 
@@ -491,6 +467,15 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1153974 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153974
   guestfish prints 'n' in error message
 
+1154408 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1154408
+  libguestfs does not allow registering a qemu+tcp backend
+
+1155229 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1155229
+  RFE: Allow uploading virt-v2v converted images directly to Cinder
+
+1155610 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1155610
+  disable uninstallation of VMware drivers on Linux for RHEL 7.1
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -518,7 +503,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1145908 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145908
   No virtio drivers available warning shows when converting win8 guest
 
-(166 bugs)
+(161 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -533,30 +518,21 @@ You can help by testing the fixes.
 1151738 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151738
   typo error in man page of virt-edit
 
-1151766 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151766
-  libguestfs-bash-completion package contains file /usr/share/bash-completion/completions/virt-log, but no _virt_log() function in that file
-
-1151900 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151900
-  Should also add a field for directory files when run virt-ls with --csv option
-
-1151910 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151910
-  virt-ls should remove '/' in the output when specify the directory name as /etc/
+1155121 POST https://bugzilla.redhat.com/show_bug.cgi?id=1155121
+  Virt-v2v will fail when using relative path for -i ova
 
 1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
   Recommended default clock/timer settings
 
-1150701 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150701
-  virt-v2v does not fstrim data disks and non-mounted filesystems
-
-1151033 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151033
-  virt-v2v conversions from VMware vCenter server run slowly
-
-1153730 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153730
-  Booting windows 2008 R2 if=virtio gets BSOD
+1153589 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153589
+  virt-v2v will hang when converting esx guest before disk copy phase
 
 805417 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=805417
   RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
 
+980790 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=980790
+  fstrim returns error "FITRIM ioctl failed: Inappropriate ioctl for device"
+
 1020950 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1020950
   CVE-2013-4419 libguestfs: insecure temporary directory handling for guestfish's network socket [epel-5]
 
@@ -575,6 +551,9 @@ You can help by testing the fixes.
 1091856 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1091856
   scrub-file can't handle link file
 
+1100528 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1100528
+  These APIs also need to add to `guestfish -h` command list
+
 1113020 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1113020
   Support virt-sparsify option to allow specifying temporary file or block device
 
@@ -584,12 +563,6 @@ You can help by testing the fixes.
 1138634 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1138634
   Remove user accounts from "/etc/shadow" when exeucte virt-sysprep with '--enable user-account' option
 
-1140547 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140547
-  virt-builder option '--format' don't work well
-
-1140894 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140894
-  No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
-
 1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
   qemu-img shows error message for backing file twice
 
@@ -599,40 +572,28 @@ You can help by testing the fixes.
 1141157 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1141157
   virt-sysprep option '--user-accounts' don't work well
 
-1142158 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1142158
-  Illegal command 'part-get-name /dev/sda1 1' cause libguestfs appliance crashed
-
-1142178 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1142178
-  virt-customize: No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
-
-1142186 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1142186
-  virt-sysprep option '--mount-options' don't work well
-
-1142416 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1142416
-  part-get-name give 'libguestfs: error: part_get_name: parted does not support the machine output (-m)' error message when run 'part-get-name /dev/sda 1'
-
 1143887 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1143887
   Warning shows when converting guests to rhev:chown: changing ownership of ?/tmp/v2v.u48xag/*.ovf?: Invalid argument
 
 1143949 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1143949
   virt-customize option '--password-crypto' do not work
 
-1144197 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1144197
-  Disable libguestfs UML backend mode in RHEL7
-
-1145916 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1145916
-  virt-v2v fails to convert win7 guest
-
 1147065 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1147065
   regression setting root password with virt-builder/virt-customize
 
 1149640 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1149640
   hardcoded el7 disttag in BR makes build fail on ppc64le
 
-1153515 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1153515
-  empty (but set) LIBGUESTFS_BACKEND prints libguestfs: error: invalid backend:
+1150701 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1150701
+  virt-v2v does not fstrim data disks and non-mounted filesystems
 
-(36 bugs)
+1151033 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1151033
+  virt-v2v conversions from VMware vCenter server run slowly
+
+1152998 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1152998
+  virt-v2v / qemu-img fails on ova image
+
+(28 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
@@ -670,6 +631,12 @@ These bugs are in the VERIFIED state.
 1140050 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140050
   No error shows when multiple conflicting options used with virt-v2v
 
+1140547 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140547
+  virt-builder option '--format' don't work well
+
+1140894 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140894
+  No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
+
 1141113 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141113
   virt-v2v fails to convert esx guests
 
@@ -688,12 +655,27 @@ These bugs are in the VERIFIED state.
 1142004 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142004
   virt-v2v prints waring:WARNING:/files/boot/grub/device.map references unknown device "xvda"
 
+1142158 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142158
+  Illegal command 'part-get-name /dev/sda1 1' cause libguestfs appliance crashed
+
+1142178 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142178
+  virt-customize: No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
+
+1142186 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142186
+  virt-sysprep option '--mount-options' don't work well
+
+1142416 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142416
+  part-get-name give 'libguestfs: error: part_get_name: parted does not support the machine output (-m)' error message when run 'part-get-name /dev/sda 1'
+
 1143866 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1143866
   virt-v2v fails with error: cannot open Packages index using db5
 
 1143883 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1143883
   warning shows when converting rhel7 guest:virt-v2v:could not update grub2 console: aug_get: no matching node (ignored)
 
+1144197 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144197
+  Disable libguestfs UML backend mode in RHEL7
+
 1144201 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1144201
   guestfish can not restore terminal's output colour when exit guestfish, if the terminal's background colour is black then it will make a inconvenient
 
@@ -703,6 +685,9 @@ These bugs are in the VERIFIED state.
 1145582 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145582
   Failed to import sparse qcow2 disk image after converting to rhevm
 
+1145916 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
+  virt-v2v fails to convert win7 guest
+
 1145995 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1145995
   Improve the error info when converting windows guest with unclean file system
 
@@ -727,6 +712,21 @@ These bugs are in the VERIFIED state.
 1150880 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150880
   virt-v2v: warning: display <graphics type='sdl'> was ignored when converting rhel5 guest with sdl graphics
 
-(30 bugs)
+1151766 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151766
+  libguestfs-bash-completion package contains file /usr/share/bash-completion/completions/virt-log, but no _virt_log() function in that file
+
+1151900 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151900
+  Should also add a field for directory files when run virt-ls with --csv option
+
+1151910 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151910
+  virt-ls should remove '/' in the output when specify the directory name as /etc/
+
+1153515 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153515
+  empty (but set) LIBGUESTFS_BACKEND prints libguestfs: error: invalid backend:
+
+1153730 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1153730
+  Booting windows 2008 R2 if=virtio gets BSOD
+
+(43 bugs)
 
 End of BUGS file.
diff --git a/configure.ac b/configure.ac
index b1db2d8..d464615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [29])
-m4_define([libguestfs_release], [0])
+m4_define([libguestfs_release], [1])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index f76ed4e..9e49c17 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.28.0\n"
+"Project-Id-Version: libguestfs 1.29.1\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-18 09:25+0200\n"
+"POT-Creation-Date: 2014-10-22 14:35+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"
diff --git a/po/en_GB.po b/po/en_GB.po
index 490d376..ab3e866 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ec5ef89..1913ce3 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -230,10 +230,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -316,12 +317,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -361,7 +366,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -371,14 +376,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -496,6 +501,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -747,7 +756,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -826,7 +835,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -836,7 +845,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -848,15 +857,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -866,7 +875,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -876,7 +885,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -900,11 +909,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1046,7 +1055,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1098,7 +1107,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1106,7 +1115,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1194,8 +1203,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1243,7 +1252,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1279,7 +1288,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1293,7 +1302,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1361,7 +1370,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1416,11 +1425,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1432,11 +1441,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1448,7 +1457,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1456,7 +1465,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1487,15 +1496,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1708,11 +1717,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2098,11 +2107,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2126,7 +2135,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2144,7 +2153,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2230,7 +2239,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2268,7 +2277,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2298,13 +2307,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2324,15 +2333,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2389,7 +2398,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2403,7 +2412,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2441,45 +2450,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2487,7 +2500,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2597,11 +2610,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2617,11 +2630,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2637,7 +2650,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2657,13 +2670,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2671,7 +2684,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2706,21 +2719,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2770,7 +2783,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2813,10 +2826,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2825,7 +2842,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2841,7 +2858,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2905,7 +2930,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2919,7 +2944,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3134,13 +3159,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 888a7d0..4046906 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -229,10 +229,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -315,12 +316,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -360,7 +365,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -370,14 +375,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -495,6 +500,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -746,7 +755,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -825,7 +834,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -835,7 +844,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -847,15 +856,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -875,7 +884,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -899,11 +908,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1045,7 +1054,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1097,7 +1106,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1105,7 +1114,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1193,8 +1202,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1242,7 +1251,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1278,7 +1287,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1292,7 +1301,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1360,7 +1369,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1415,11 +1424,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1431,11 +1440,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1447,7 +1456,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1455,7 +1464,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1486,15 +1495,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1707,11 +1716,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2097,11 +2106,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2125,7 +2134,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2143,7 +2152,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2229,7 +2238,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2267,7 +2276,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2297,13 +2306,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2323,15 +2332,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2388,7 +2397,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2402,7 +2411,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2440,45 +2449,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2486,7 +2499,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2596,11 +2609,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2616,11 +2629,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2636,7 +2649,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2656,13 +2669,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2670,7 +2683,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2705,21 +2718,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2769,7 +2782,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2812,10 +2825,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2824,7 +2841,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2840,7 +2857,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2904,7 +2929,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2918,7 +2943,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3133,13 +3158,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 09e8d91..1f4aa92 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -229,10 +229,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -315,12 +316,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -360,7 +365,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -370,14 +375,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -495,6 +500,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -746,7 +755,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -825,7 +834,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -835,7 +844,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -847,15 +856,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -875,7 +884,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -899,11 +908,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1045,7 +1054,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1097,7 +1106,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1105,7 +1114,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1193,8 +1202,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1242,7 +1251,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1278,7 +1287,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1292,7 +1301,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1360,7 +1369,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1415,11 +1424,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1431,11 +1440,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1447,7 +1456,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1455,7 +1464,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1486,15 +1495,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1707,11 +1716,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2097,11 +2106,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2125,7 +2134,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2143,7 +2152,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2229,7 +2238,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2267,7 +2276,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2297,13 +2306,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2323,15 +2332,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2388,7 +2397,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2402,7 +2411,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2440,45 +2449,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2486,7 +2499,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2596,11 +2609,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2616,11 +2629,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2636,7 +2649,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2656,13 +2669,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2670,7 +2683,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2705,21 +2718,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2769,7 +2782,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2812,10 +2825,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2824,7 +2841,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2840,7 +2857,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2904,7 +2929,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2918,7 +2943,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3133,13 +3158,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index 7c35f36..0f2dba7 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 775ca74..5e457cf 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.28.0\n"
+"Project-Id-Version: libguestfs 1.29.1\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -104,7 +104,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -219,7 +219,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -227,10 +227,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -313,12 +314,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -358,7 +363,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -368,14 +373,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,6 +498,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -744,7 +753,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -823,7 +832,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -833,7 +842,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -845,15 +854,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -863,7 +872,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -873,7 +882,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -897,11 +906,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1043,7 +1052,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1095,7 +1104,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1103,7 +1112,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1191,8 +1200,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1240,7 +1249,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1276,7 +1285,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1290,7 +1299,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1358,7 +1367,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1413,11 +1422,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1429,11 +1438,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1445,7 +1454,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1453,7 +1462,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1484,15 +1493,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1705,11 +1714,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2095,11 +2104,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2123,7 +2132,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2141,7 +2150,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2227,7 +2236,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2265,7 +2274,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2295,13 +2304,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2321,15 +2330,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2386,7 +2395,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2400,7 +2409,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2438,45 +2447,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2484,7 +2497,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2594,11 +2607,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2614,11 +2627,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2634,7 +2647,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2654,13 +2667,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2668,7 +2681,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2703,21 +2716,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2767,7 +2780,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2810,10 +2823,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2822,7 +2839,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2838,7 +2855,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2902,7 +2927,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2916,7 +2941,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3131,13 +3156,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 9b64f34..8bb5d0b 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 31b85bf..bd2b8f9 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -229,10 +229,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -315,12 +316,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -360,7 +365,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -370,14 +375,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -495,6 +500,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -746,7 +755,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -825,7 +834,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -835,7 +844,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -847,15 +856,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -875,7 +884,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -899,11 +908,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1045,7 +1054,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1097,7 +1106,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1105,7 +1114,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1193,8 +1202,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1242,7 +1251,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1278,7 +1287,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1292,7 +1301,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1360,7 +1369,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1415,11 +1424,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1431,11 +1440,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1447,7 +1456,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1455,7 +1464,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1486,15 +1495,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1707,11 +1716,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2097,11 +2106,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2125,7 +2134,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2143,7 +2152,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2229,7 +2238,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2267,7 +2276,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2297,13 +2306,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2323,15 +2332,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2388,7 +2397,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2402,7 +2411,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2440,45 +2449,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2486,7 +2499,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2596,11 +2609,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2616,11 +2629,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2636,7 +2649,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2656,13 +2669,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2670,7 +2683,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2705,21 +2718,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2769,7 +2782,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2812,10 +2825,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2824,7 +2841,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2840,7 +2857,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2904,7 +2929,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2918,7 +2943,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3133,13 +3158,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 12f298e..9748bb7 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -230,10 +230,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -316,12 +317,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -361,7 +366,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -371,14 +376,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -496,6 +501,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -747,7 +756,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -826,7 +835,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -836,7 +845,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -848,15 +857,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -866,7 +875,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -876,7 +885,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -900,11 +909,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1046,7 +1055,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1098,7 +1107,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1106,7 +1115,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1194,8 +1203,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1243,7 +1252,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1279,7 +1288,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1293,7 +1302,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1361,7 +1370,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1416,11 +1425,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1432,11 +1441,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1448,7 +1457,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1456,7 +1465,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1487,15 +1496,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1708,11 +1717,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2098,11 +2107,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2126,7 +2135,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2144,7 +2153,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2230,7 +2239,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2268,7 +2277,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2298,13 +2307,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2324,15 +2333,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2389,7 +2398,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2403,7 +2412,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2441,45 +2450,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2487,7 +2500,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2597,11 +2610,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2617,11 +2630,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2637,7 +2650,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2657,13 +2670,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2671,7 +2684,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2706,21 +2719,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2770,7 +2783,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2813,10 +2826,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2825,7 +2842,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2841,7 +2858,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2905,7 +2930,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2919,7 +2944,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3134,13 +3159,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index c8bda63..44b5081 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 0e844ba..157e596 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -106,7 +106,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -229,10 +229,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -315,12 +316,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -360,7 +365,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -370,14 +375,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -495,6 +500,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -746,7 +755,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -825,7 +834,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -835,7 +844,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -847,15 +856,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -865,7 +874,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -875,7 +884,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -899,11 +908,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1045,7 +1054,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1097,7 +1106,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1105,7 +1114,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1193,8 +1202,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1242,7 +1251,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1278,7 +1287,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1292,7 +1301,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1360,7 +1369,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1415,11 +1424,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1431,11 +1440,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1447,7 +1456,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1455,7 +1464,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1486,15 +1495,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1707,11 +1716,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2097,11 +2106,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2125,7 +2134,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2143,7 +2152,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2229,7 +2238,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2267,7 +2276,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2297,13 +2306,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2323,15 +2332,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2388,7 +2397,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2402,7 +2411,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2440,45 +2449,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2486,7 +2499,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2596,11 +2609,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2616,11 +2629,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2636,7 +2649,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2656,13 +2669,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2670,7 +2683,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2705,21 +2718,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2769,7 +2782,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2812,10 +2825,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2824,7 +2841,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2840,7 +2857,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2904,7 +2929,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2918,7 +2943,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3133,13 +3158,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index eaaf42f..6167874 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -224,7 +224,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,10 +232,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -318,12 +319,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -363,7 +368,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -373,14 +378,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -498,6 +503,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -749,7 +758,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -828,7 +837,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -838,7 +847,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -850,15 +859,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -868,7 +877,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -878,7 +887,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -902,11 +911,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1048,7 +1057,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1100,7 +1109,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1108,7 +1117,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1196,8 +1205,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1245,7 +1254,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1281,7 +1290,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1295,7 +1304,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1363,7 +1372,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1418,11 +1427,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1434,11 +1443,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1450,7 +1459,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1458,7 +1467,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1489,15 +1498,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1710,11 +1719,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2100,11 +2109,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2128,7 +2137,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2146,7 +2155,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2232,7 +2241,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2270,7 +2279,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2300,13 +2309,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2326,15 +2335,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2391,7 +2400,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2405,7 +2414,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2443,45 +2452,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2489,7 +2502,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2599,11 +2612,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2619,11 +2632,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2639,7 +2652,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2659,13 +2672,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2673,7 +2686,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2708,21 +2721,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2772,7 +2785,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2815,10 +2828,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2827,7 +2844,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2843,7 +2860,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2907,7 +2932,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2921,7 +2946,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3136,13 +3161,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 7614441..1628279 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index f777bc4..206c29a 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+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:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr ""
 
@@ -105,7 +105,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid ""
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -228,10 +228,11 @@ msgstr ""
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -314,12 +315,16 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -359,7 +364,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,6 +499,10 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -745,7 +754,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -824,7 +833,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -834,7 +843,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr ""
 
@@ -846,15 +855,15 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -864,7 +873,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr ""
 
@@ -874,7 +883,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -898,11 +907,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr ""
 
@@ -1044,7 +1053,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1096,7 +1105,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1104,7 +1113,7 @@ msgstr ""
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1192,8 +1201,8 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr ""
 
@@ -1241,7 +1250,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr ""
 
@@ -1277,7 +1286,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1291,7 +1300,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1359,7 +1368,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1414,11 +1423,11 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1430,11 +1439,11 @@ msgstr ""
 msgid "Output VM UUID"
 msgstr ""
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr ""
 
@@ -1446,7 +1455,7 @@ msgstr ""
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr ""
 
@@ -1454,7 +1463,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1485,15 +1494,15 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1706,11 +1715,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -2096,11 +2105,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2124,7 +2133,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr ""
 
@@ -2142,7 +2151,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr ""
 
@@ -2228,7 +2237,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2266,7 +2275,7 @@ msgstr ""
 msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr ""
 
@@ -2296,13 +2305,13 @@ msgid ""
 "v2v (^C) and rerun it as root."
 msgstr ""
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr ""
 
@@ -2322,15 +2331,15 @@ msgid ""
 "\\CurrentVersion"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr ""
 
@@ -2387,7 +2396,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2401,7 +2410,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2439,45 +2448,49 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
 msgstr ""
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr ""
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
 msgstr ""
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr ""
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
 msgstr ""
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr ""
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 
@@ -2485,7 +2498,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr ""
 
@@ -2595,11 +2608,11 @@ msgstr ""
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2615,11 +2628,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2635,7 +2648,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -2655,13 +2668,13 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2669,7 +2682,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -2704,21 +2717,21 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2768,7 +2781,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2811,10 +2824,14 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -2823,7 +2840,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2839,7 +2856,15 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -2903,7 +2928,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -2917,7 +2942,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3132,13 +3157,13 @@ msgstr ""
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 468d446..2030297 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-10-18 09:24+0100\n"
+"POT-Creation-Date: 2014-10-22 14:35+0100\n"
 "PO-Revision-Date: 2014-10-18 08:00+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -96,7 +96,7 @@ msgstr ""
 msgid "%s"
 msgstr "%s"
 
-#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
+#: ../v2v/v2v.ml:618 ../v2v/v2v.ml:507
 msgid "%s (ignored)"
 msgstr "%s (проігноровано)"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../customize/customize_run.ml:334 ../builder/builder.ml:666
+#: ../customize/customize_run.ml:334 ../builder/builder.ml:670
 msgid "%s: %s (ignored)\n"
 msgstr "%s: %s (проігноровано)\n"
 
@@ -301,7 +301,7 @@ msgstr ""
 "Скористайтеся параметром --list для отримання списку доступних гостьових "
 "систем.\n"
 
-#: ../builder/builder.ml:334
+#: ../builder/builder.ml:338
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr "%s: виведення до символьного пристрою або /dev/null неможливе\n"
 
@@ -309,10 +309,11 @@ msgstr "%s: виведення до символьного пристрою аб
 msgid ""
 "%s: convert a guest to use KVM\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported esx_guest\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported "
+"esx_guest\n"
 "\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
-"rhev.nfs:/export_domain --network rhevm\n"
+" virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest -o rhev -"
+"os rhev.nfs:/export_domain --network rhevm\n"
 "\n"
 " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
 "\n"
@@ -326,25 +327,6 @@ msgid ""
 "A short summary of the options is given below.  For detailed help please\n"
 "read the man page virt-v2v(1).\n"
 msgstr ""
-"%s: перетворити гостьову систему для використання KVM\n"
-"\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported гість_esx\n"
-"\n"
-" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi гість_esx -o rhev -os "
-"rhev.nfs:/домен_експортування --network rhevm\n"
-"\n"
-" virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
-"\n"
-" virt-v2v -i disk disk.img -o local -os /var/tmp\n"
-"\n"
-" virt-v2v -i disk disk.img -o glance\n"
-"\n"
-"Передбачено супутню оболонку з назвою «virt-p2v», яка постачається як\n"
-"образ ISO або компакт-диска, з якого можна завантажитися на фізичних "
-"машинах.\n"
-"\n"
-"Нижче наведено коротке резюме щодо параметрів. Докладніший опис наведено у\n"
-"підручнику (man) з virt-v2v(1).\n"
 
 #: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
@@ -428,7 +410,7 @@ msgstr ""
 "Вам слід встановити gpg, скористатися параметром --gpg або скористатися "
 "параметром --no-check-signature.\n"
 
-#: ../builder/builder.ml:361
+#: ../builder/builder.ml:365
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
@@ -436,6 +418,10 @@ msgstr ""
 "%s: образ не можна стискати, розмір виведених даних для цього образу є надто "
 "малим. Потрібний розмір = %s, мінімальний розмір = %s\n"
 
+#: ../builder/builder.ml:321
+msgid "%s: input file (%s) has an unsupported type\n"
+msgstr ""
+
 #: ../builder/sources.ml:135
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr "%s: внутрішня помилка: некоректний аргумент: %s\n"
@@ -484,7 +470,7 @@ msgstr "%s: розмір нового розділу є нульовим або
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr "%s: немає запису «uri» для «%s» у %s, пропускаємо\n"
 
-#: ../builder/builder.ml:670
+#: ../builder/builder.ml:674
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -499,7 +485,7 @@ msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 "%s: у образі гостьової системи не було знайдено жодної операційної системи\n"
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:490
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
@@ -510,7 +496,7 @@ msgstr ""
 "Будь ласка, створіть повідомлення щодо вади, вказавши використані вами "
 "аргументи командного рядка.\n"
 
-#: ../builder/builder.ml:366
+#: ../builder/builder.ml:370
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -670,6 +656,10 @@ msgstr ""
 "%s: невідомий тип таблиці розділів.\n"
 "У virt-resize передбачено підтримку лише таблиць розділів MBR (DOS) та GPT."
 
+#: ../v2v/input_ova.ml:66
+msgid "%s: unsupported file format"
+msgstr ""
+
 #: ../builder/cmdline.ml:272
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
@@ -968,7 +958,7 @@ msgstr "-o vdsm: не вказано сховище виведення дани
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr "-os %s: каталогу виведення даних не існує або вказано не каталог"
 
-#: ../v2v/input_libvirtxml.ml:179
+#: ../v2v/input_libvirtxml.ml:181
 msgid "<disk type='%s'> was ignored"
 msgstr "<disk type='%s'> проігноровано"
 
@@ -1054,7 +1044,7 @@ msgstr "Перевірити числові підписи"
 msgid "Check there is enough space in $TMPDIR"
 msgstr "Перевірити, чи достатньо місця у $TMPDIR"
 
-#: ../v2v/v2v.ml:227
+#: ../v2v/v2v.ml:238
 msgid "Checking for sufficient free disk space in the guest"
 msgstr "Перевіряємо, чи достатньо вільного місця на диску гостьової системи"
 
@@ -1066,7 +1056,7 @@ msgstr ""
 "Спорожнюємо резервну пам’ять Linux на %s…\n"
 "%!"
 
-#: ../v2v/v2v.ml:275
+#: ../v2v/v2v.ml:286
 msgid "Closing the overlay"
 msgstr "Закриваємо оверлей"
 
@@ -1078,15 +1068,15 @@ msgstr "Параметр, призначений для збереження с
 msgid "Compressed output format"
 msgstr "Стиснутий формат виведення даних"
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:618
 msgid "Converting %s to %s"
 msgstr "Перетворюємо %s на %s"
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:253
 msgid "Converting %s to run on KVM"
 msgstr "Перетворюємо %s для уможливлення запуску у KVM"
 
-#: ../v2v/v2v.ml:240
+#: ../v2v/v2v.ml:251
 msgid "Converting the guest to run on KVM"
 msgstr "Перетворюємо гостьову систему для запуску у KVM"
 
@@ -1098,7 +1088,7 @@ msgstr ""
 "Копіювати до призначення і розрідити…\n"
 "%!"
 
-#: ../builder/builder.ml:545
+#: ../builder/builder.ml:549
 msgid "Copying"
 msgstr "Копіювання"
 
@@ -1110,7 +1100,7 @@ msgstr ""
 "Копіюємо %s...\n"
 "%!"
 
-#: ../v2v/v2v.ml:296
+#: ../v2v/v2v.ml:307
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr "Копіювання диска %d з %d на %s (%s)"
 
@@ -1138,11 +1128,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr "Створювати символічні посилання"
 
-#: ../v2v/v2v.ml:114
+#: ../v2v/v2v.ml:125
 msgid "Creating an overlay to protect the source from being modified"
 msgstr "Створюємо оверлей для захисту джерела від внесення змін"
 
-#: ../v2v/v2v.ml:391
+#: ../v2v/v2v.ml:409
 msgid "Creating output metadata"
 msgstr "Створюємо метадані результатів"
 
@@ -1294,7 +1284,7 @@ msgstr "Розмір отриманого:"
 msgid "Downloading: %s"
 msgstr "Отримуємо: %s"
 
-#: ../v2v/v2v.ml:425
+#: ../v2v/v2v.ml:443
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1346,7 +1336,7 @@ msgstr "Увімкнути трасування викликів libguestfs"
 msgid "Enable/disable specific operations"
 msgstr "Увімкнути або вимкнути специфічні операції"
 
-#: ../v2v/v2v.ml:438
+#: ../v2v/v2v.ml:456
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
@@ -1356,7 +1346,7 @@ msgstr ""
 "Помилка під час обробки адреси «%s». Ознайомтеся з повідомленнями щодо "
 "помилок, які виведено раніше.\n"
 
-#: ../v2v/v2v.ml:231
+#: ../v2v/v2v.ml:242
 msgid "Estimating space required on target for each disk"
 msgstr "Оцінюємо простір, потрібний у системі призначення для кожного з дисків"
 
@@ -1461,8 +1451,8 @@ msgstr "Відбиток чинного ключа підписування"
 msgid "Fingerprint: %s\n"
 msgstr "Відбиток: %s\n"
 
-#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
-#: ../builder/builder.ml:715
+#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:256
+#: ../builder/builder.ml:719
 msgid "Finishing off"
 msgstr "Завершуємо"
 
@@ -1519,7 +1509,7 @@ msgstr ""
 "Формат диска виведених даних (типове значення: той самий формат, що і у "
 "вхідних даних)"
 
-#: ../builder/builder.ml:705
+#: ../builder/builder.ml:709
 msgid "Free space"
 msgstr "Вільне місце"
 
@@ -1559,7 +1549,7 @@ msgstr "Ігнорувати файлову систему"
 msgid "Ignore partition"
 msgstr "Ігнорувати розділ"
 
-#: ../v2v/v2v.ml:172
+#: ../v2v/v2v.ml:183
 msgid "Initializing the target %s"
 msgstr "Ініціалізуємо призначення %s"
 
@@ -1575,7 +1565,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr "Формат вхідних даних (для -i диск)"
 
-#: ../v2v/v2v.ml:206
+#: ../v2v/v2v.ml:217
 msgid "Inspecting the overlay"
 msgstr "Вивчаємо оверлей"
 
@@ -1643,7 +1633,7 @@ msgstr "Відобразити місток «in» на «out»"
 msgid "Map network 'in' to 'out'"
 msgstr "Відобразити мережу «in» на «out»"
 
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:282
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 "Виконуємо прив’язку даних файлової системи для уникнення копіювання "
@@ -1711,11 +1701,11 @@ msgstr ""
 "підтримку,\n"
 "буде створено нові випадкові UUID, які буде пов’язано з файловими системами."
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:631
 msgid "Opening the new disk"
 msgstr "Відкриваємо новий диск"
 
-#: ../v2v/v2v.ml:142
+#: ../v2v/v2v.ml:153
 msgid "Opening the overlay"
 msgstr "Відкриваємо оверлей"
 
@@ -1727,11 +1717,11 @@ msgstr "Відкриваємо джерело %s"
 msgid "Output VM UUID"
 msgstr "Вивести UUID віртуальної машини"
 
-#: ../builder/builder.ml:700
+#: ../builder/builder.ml:704
 msgid "Output file"
 msgstr "Файл виведення"
 
-#: ../builder/builder.ml:702
+#: ../builder/builder.ml:706
 msgid "Output format"
 msgstr "Формат виведення"
 
@@ -1743,7 +1733,7 @@ msgstr "Формат виведення (типовий: raw)"
 msgid "Output image UUID(s)"
 msgstr ""
 
-#: ../builder/builder.ml:701
+#: ../builder/builder.ml:705
 msgid "Output size"
 msgstr "Розмір виведення"
 
@@ -1751,7 +1741,7 @@ msgstr "Розмір виведення"
 msgid "Output vol UUID(s)"
 msgstr "UUID виведених томів"
 
-#: ../v2v/v2v.ml:401
+#: ../v2v/v2v.ml:419
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr "Оверлей збережено як %s [--debug-overlays]\n"
 
@@ -1782,15 +1772,15 @@ msgstr "Нотатки POD для %s не повинні завершувати
 msgid "Perform a dry run"
 msgstr "Виконати тестовий запуск"
 
-#: ../v2v/v2v.ml:465
+#: ../v2v/v2v.ml:483
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:474
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
-#: ../builder/builder.ml:481
+#: ../builder/builder.ml:485
 msgid "Planning how to build this image"
 msgstr "Плануємо побудову цього образу"
 
@@ -2024,11 +2014,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Змінити розміри розділу"
 
-#: ../builder/builder.ml:572
+#: ../builder/builder.ml:576
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr "Змінюємо розміри (за допомогою virt-resize) для розширення диска до %s"
 
-#: ../builder/builder.ml:601
+#: ../builder/builder.ml:605
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 "Змінюємо розміри контейнера (але не файлової системи) для розширення диска "
@@ -2519,11 +2509,11 @@ msgstr ""
 "тому не є частиною віртуальної машини на диску, але ці дані зберігаються\n"
 "на диску у старіших версіях дистрибутивів."
 
-#: ../v2v/v2v.ml:261
+#: ../v2v/v2v.ml:272
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:259
+#: ../v2v/v2v.ml:270
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2555,7 +2545,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:707
 msgid "Total usable space"
 msgstr "Загальне придатне до використання місце"
 
@@ -2575,7 +2565,7 @@ msgstr "Вимкнути розріджене копіювання"
 msgid "USER:SELECTOR"
 msgstr "КОРИСТУВАЧ:ВАРІАНТ"
 
-#: ../builder/builder.ml:560
+#: ../builder/builder.ml:564
 msgid "Uncompressing"
 msgstr "Розпаковуємо"
 
@@ -2675,7 +2665,7 @@ msgstr ""
 msgid "alignment cannot be < 1"
 msgstr "значення вирівнювання не може бути меншим за 1"
 
-#: ../v2v/input_libvirt.ml:33
+#: ../v2v/input_libvirt_other.ml:33
 msgid ""
 "because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?id=1134592 "
 "you must set this environment variable:\n"
@@ -2722,7 +2712,7 @@ msgid "cannot detect the input disk format; use the -if parameter"
 msgstr ""
 "не вдалося визначити формат диска вхідних даних; скористайтеся параметром -if"
 
-#: ../v2v/input_ova.ml:80
+#: ../v2v/input_ova.ml:109
 msgid "cannot parse output of sha1sum command"
 msgstr "не вдалося обробити дані, виведені програмою sha1sum"
 
@@ -2764,13 +2754,13 @@ msgstr ""
 "роботу virt-v2v (^C), а потім повторно запустити програму від імені "
 "користувача root."
 
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:104
 msgid ""
 "checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
 "expected sha1 (%s) = %s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:445
+#: ../v2v/v2v.ml:463
 msgid "connection closed"
 msgstr "з'єднання закрито"
 
@@ -2794,17 +2784,17 @@ msgstr ""
 "не вдалося знайти ключ реєстру HKLM\\SOFTWARE\\Microsoft\\Windows"
 "\\CurrentVersion"
 
-#: ../v2v/input_libvirt.ml:75
+#: ../v2v/input_libvirt.ml:39
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 "не вдалося обробити параметр «-ic %s». Початкове повідомлення щодо помилки: "
 "%s"
 
-#: ../v2v/input_ova.ml:173
+#: ../v2v/input_ova.ml:225
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr "не вдалося обробити значення rasd:HostResource диска з документа OVF"
 
-#: ../v2v/input_ova.ml:125
+#: ../v2v/input_ova.ml:154
 msgid "could not parse ovf:Name from OVF document"
 msgstr "не вдалося обробити значення ovf:Name з документа OVF"
 
@@ -2871,7 +2861,7 @@ msgstr "заборонений символ (%c) у назві операції"
 msgid "discard/trim is not supported: %s"
 msgstr "підтримки відкидання або обрізання не передбачено: %s"
 
-#: ../v2v/v2v.ml:182
+#: ../v2v/v2v.ml:193
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2896,7 +2886,7 @@ msgstr ""
 "використати параметр «-of» для примусового визначення формату виведення "
 "даних."
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:108
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2940,15 +2930,19 @@ msgstr ""
 "Помилка під час обробки адреси «%s». Ознайомтеся з повідомленнями щодо "
 "помилок, які виведено раніше."
 
-#: ../v2v/input_ova.ml:163
+#: ../v2v/input_ova.ml:193
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:43
+#: ../v2v/input_ova.ml:211
+msgid "error uncompressing %s, see earlier error messages"
+msgstr ""
+
+#: ../v2v/input_ova.ml:63 ../v2v/input_ova.ml:52
 msgid "error unpacking %s, see earlier error messages"
 msgstr ""
 
-#: ../v2v/vCenter.ml:120
+#: ../v2v/input_libvirt_vcenter_https.ml:119
 msgid ""
 "esx: URI (-ic parameter) contains no path, so we cannot determine the "
 "datacenter name"
@@ -2956,11 +2950,11 @@ msgstr ""
 "esx: адреса (параметр -ic) не містить шляху, отже ми не можемо визначити "
 "назву датацентру"
 
-#: ../v2v/vCenter.ml:182
+#: ../v2v/input_libvirt_vcenter_https.ml:85
 msgid "esx: URL not found: %s"
 msgstr "esx: адреси не знайдено: %s"
 
-#: ../v2v/vCenter.ml:202
+#: ../v2v/input_libvirt_vcenter_https.ml:105
 msgid ""
 "esx: could not read session cookie from the vCenter Server, conversion may "
 "consume all sessions on the server and fail part way through"
@@ -2968,11 +2962,11 @@ msgstr ""
 "esx: не вдалося прочитати куку сеансу з сервера vCenter. Перетворення може "
 "спожити усі сеанси на сервері і помилитися для одного з них."
 
-#: ../v2v/vCenter.ml:174
+#: ../v2v/input_libvirt_vcenter_https.ml:77
 msgid "esx: incorrect username or password"
 msgstr "esx: помилкове ім’я користувача або пароль"
 
-#: ../v2v/vCenter.ml:176
+#: ../v2v/input_libvirt_vcenter_https.ml:79
 msgid ""
 "esx: incorrect username or password.  You might need to specify the username "
 "in the URI like this: %s://USERNAME@[etc]"
@@ -2980,11 +2974,11 @@ msgstr ""
 "esx: помилкове ім’я користувача або пароль. Вам варто вказати ім’я "
 "користувача у адресі, ось так: %s://КОРИСТУВАЧ@[інше]"
 
-#: ../v2v/vCenter.ml:187
+#: ../v2v/input_libvirt_vcenter_https.ml:90
 msgid "esx: invalid response from server"
 msgstr "esx: некоректна відповідь сервера"
 
-#: ../v2v/vCenter.ml:168
+#: ../v2v/input_libvirt_vcenter_https.ml:71
 msgid "esx: no status code in output of 'curl' command.  Is 'curl' installed?"
 msgstr ""
 "esx: немає коду стану у даних, виведених командою «curl». Чи встановлено "
@@ -2994,7 +2988,7 @@ msgstr ""
 msgid "exception: %s"
 msgstr "виключення: %s"
 
-#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:145 ../v2v/input_libvirtxml.ml:58
 msgid "expecting XML expression to return an integer (expression: %s)"
 msgstr "очікуємо, що вираз XML поверне ціле число (вираз: %s)"
 
@@ -3115,13 +3109,13 @@ msgstr "для цього типу гостьових систем не можн
 msgid "image directory (%s) does not exist or is not a directory"
 msgstr "каталогу образу (%s) не існує, або ж це не каталог"
 
-#: ../v2v/input_libvirtxml.ml:67
+#: ../v2v/input_libvirtxml.ml:70
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 "у метаданих XML libvirt пропущено <domain type='...'> або вказано порожнє "
 "значення"
 
-#: ../v2v/input_libvirtxml.ml:69
+#: ../v2v/input_libvirtxml.ml:72
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr "у метаданих XML libvirt пропущено <name> або вказано порожнє значення"
 
@@ -3137,11 +3131,11 @@ msgstr "внутрішня помилка: помилка оцінки у %s, р
 msgid "internal error: invalid argument: %s"
 msgstr "внутрішня помилка: некоректний аргумент: %s"
 
-#: ../v2v/v2v.ml:308
+#: ../v2v/v2v.ml:319
 msgid "internal error: qemu corrupted the overlay file"
 msgstr "внутрішня помилка: файл оверлею пошкоджено qemu"
 
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:147
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr "внутрішня помилка: qemu-img не створено оверлею із резервним файлом"
 
@@ -3157,7 +3151,7 @@ msgstr "ядро %s перебуває поза ієрархією grub %s"
 msgid "libguestfs error: %s"
 msgstr "помилка libguestfs: %s"
 
-#: ../v2v/v2v.ml:472
+#: ../v2v/v2v.ml:490
 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 "
@@ -3186,7 +3180,7 @@ msgstr ""
 "того, можливо, вам слід повторно запустити virt-v2v від імені користувача "
 "root."
 
-#: ../v2v/v2v.ml:452
+#: ../v2v/v2v.ml:470
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -3195,7 +3189,7 @@ msgstr ""
 "завантаження. Скористайтеся параметром --root для зміни способу обробки "
 "таких систем за допомогою virt-v2v."
 
-#: ../v2v/input_libvirtxml.ml:175
+#: ../v2v/input_libvirtxml.ml:177
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr "мережу <disk> з <source protocol='%s'> проігноровано"
 
@@ -3203,7 +3197,7 @@ msgstr "мережу <disk> з <source protocol='%s'> проігноровано
 msgid "never|always|auto"
 msgstr "never|always|auto"
 
-#: ../v2v/input_ova.ml:54
+#: ../v2v/input_ova.ml:83
 msgid "no .ovf file was found in %s"
 msgstr ""
 
@@ -3246,17 +3240,17 @@ msgstr ""
 msgid "no operating systems were found in the guest image"
 msgstr "у образі гостьової системи не було знайдено жодної операційної системи"
 
-#: ../v2v/input_ova.ml:71
+#: ../v2v/input_ova.ml:100
 msgid "no output from sha1sum command, see previous errors"
 msgstr ""
 "немає даних, виведених програмою sha1sum, див. попередні повідомлення щодо "
 "помилок"
 
-#: ../v2v/v2v.ml:418
+#: ../v2v/v2v.ml:436
 msgid "no root device found in this operating system image."
 msgstr "у цьому образі операційної системи не знайдено кореневого пристрою."
 
-#: ../v2v/input_libvirt.ml:103
+#: ../v2v/input_libvirt.ml:64
 msgid ""
 "no support for remote libvirt connections to '-ic %s'.  The conversion may "
 "fail when it tries to read the source disks."
@@ -3264,7 +3258,7 @@ msgstr ""
 "немає підтримки віддалених з’єднань libvirt з «-ic %s». Перетворення може "
 "призвести до помилок під час спроб прочитати диски джерел даних."
 
-#: ../v2v/v2v.ml:546
+#: ../v2v/v2v.ml:564
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -3322,7 +3316,7 @@ msgstr ""
 "виведенням «%s» не може бути символьний пристрій, виводити дані можна лише "
 "до звичайного файла"
 
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:203
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -3378,12 +3372,16 @@ msgstr ""
 "pwrite: незавершений запис під час відновлення заголовка розділу резервної "
 "пам’яті"
 
-#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
+#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 "помилка під час спроби виконати qemu-img, див. попередні повідомлення щодо "
 "помилок"
 
+#: ../v2v/input_libvirt_vcenter_https.ml:291
+msgid "qemu-img rebase failed (ignored)"
+msgstr ""
+
 #: ../customize/customize_run.ml:152
 msgid "random seed could not be set for this type of guest"
 msgstr ""
@@ -3393,7 +3391,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr "resize2fs"
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:481
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 "не знайдено кореневого пристрою %s. Знайдено такі кореневі пристрої: %s"
@@ -3410,7 +3408,15 @@ msgstr "помилка скрипту"
 msgid "sectors"
 msgstr "сектори"
 
-#: ../v2v/input_libvirt.ml:43
+#: ../v2v/input_libvirt_vcenter_https.ml:248
+msgid "source disk has <source dev=...> attribute in XML"
+msgstr ""
+
+#: ../v2v/v2v.ml:81
+msgid "source has no hard disks!"
+msgstr ""
+
+#: ../v2v/input_libvirt_other.ml:43
 msgid ""
 "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set).  "
 "Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
@@ -3499,7 +3505,7 @@ msgstr ""
 "Гостьову систему буде налаштовано на використання повільнішого емульованого "
 "пристрою."
 
-#: ../v2v/input_libvirtxml.ml:126
+#: ../v2v/input_libvirtxml.ml:132
 msgid "this guest has no non-removable disks"
 msgstr "у цій гостьовій системі немає непортативних дисків"
 
@@ -3515,7 +3521,7 @@ msgstr ""
 "не вдалося знайти жодного коректного файла налаштувань modprobe, зокрема /"
 "etc/modprobe.conf"
 
-#: ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:502
 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 "
@@ -3789,13 +3795,13 @@ msgstr "virt-sysprep: скрипт: помилка (код %d)\n"
 msgid "virt-sysprep: script: killed by signal (%d)\n"
 msgstr "virt-sysprep: скрипт: роботу завершено сигналом (%d)\n"
 
-#: ../v2v/input_libvirtxml.ml:102
+#: ../v2v/input_libvirtxml.ml:105
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:262
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 "virt-v2v не може виконувати перетворення цього типу гостьових систем (%s/%s)"
@@ -10296,3 +10302,46 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
+
+#~ msgid ""
+#~ "%s: convert a guest to use KVM\n"
+#~ "\n"
+#~ " virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported "
+#~ "esx_guest\n"
+#~ "\n"
+#~ " virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest -o rhev -os "
+#~ "rhev.nfs:/export_domain --network rhevm\n"
+#~ "\n"
+#~ " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
+#~ "\n"
+#~ " virt-v2v -i disk disk.img -o local -os /var/tmp\n"
+#~ "\n"
+#~ " virt-v2v -i disk disk.img -o glance\n"
+#~ "\n"
+#~ "There is a companion front-end called \"virt-p2v\" which comes as an\n"
+#~ "ISO or CD image that can be booted on physical machines.\n"
+#~ "\n"
+#~ "A short summary of the options is given below.  For detailed help please\n"
+#~ "read the man page virt-v2v(1).\n"
+#~ msgstr ""
+#~ "%s: перетворити гостьову систему для використання KVM\n"
+#~ "\n"
+#~ " virt-v2v -ic vpx://esx.example.com/Datacenter/esxi -os imported "
+#~ "гість_esx\n"
+#~ "\n"
+#~ " virt-v2v -ic vpx://esx.example.com/Datacenter/esxi гість_esx -o rhev -os "
+#~ "rhev.nfs:/домен_експортування --network rhevm\n"
+#~ "\n"
+#~ " virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp\n"
+#~ "\n"
+#~ " virt-v2v -i disk disk.img -o local -os /var/tmp\n"
+#~ "\n"
+#~ " virt-v2v -i disk disk.img -o glance\n"
+#~ "\n"
+#~ "Передбачено супутню оболонку з назвою «virt-p2v», яка постачається як\n"
+#~ "образ ISO або компакт-диска, з якого можна завантажитися на фізичних "
+#~ "машинах.\n"
+#~ "\n"
+#~ "Нижче наведено коротке резюме щодо параметрів. Докладніший опис наведено "
+#~ "у\n"
+#~ "підручнику (man) з virt-v2v(1).\n"

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

