[Pkg-libvirt-commits] [libguestfs] 78/116: Version 1.29.8.

Hilko Bengen bengen at moszumanska.debian.org
Wed Nov 26 22:05:20 UTC 2014


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

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

commit 28f2cb7e3a3be4232f1403136b1e235ddfec417b
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Nov 18 16:55:21 2014 +0000

    Version 1.29.8.
---
 BUGS                        |  59 +++++++++++++++------
 configure.ac                |   2 +-
 po-docs/ja.po               |  22 +++++---
 po-docs/libguestfs-docs.pot |  14 ++---
 po-docs/uk.po               |  16 +++---
 po/en_GB.po                 | 124 ++++++++++++++++++++++++-------------------
 po/es.po                    | 124 ++++++++++++++++++++++++-------------------
 po/gu.po                    | 124 ++++++++++++++++++++++++-------------------
 po/hi.po                    | 124 ++++++++++++++++++++++++-------------------
 po/kn.po                    | 124 ++++++++++++++++++++++++-------------------
 po/libguestfs.pot           | 126 +++++++++++++++++++++++++-------------------
 po/ml.po                    | 124 ++++++++++++++++++++++++-------------------
 po/mr.po                    | 124 ++++++++++++++++++++++++-------------------
 po/nl.po                    | 124 ++++++++++++++++++++++++-------------------
 po/or.po                    | 124 ++++++++++++++++++++++++-------------------
 po/pa.po                    | 124 ++++++++++++++++++++++++-------------------
 po/pl.po                    | 124 ++++++++++++++++++++++++-------------------
 po/ta.po                    | 124 ++++++++++++++++++++++++-------------------
 po/te.po                    | 124 ++++++++++++++++++++++++-------------------
 po/uk.po                    | 124 ++++++++++++++++++++++++-------------------
 20 files changed, 1127 insertions(+), 848 deletions(-)

diff --git a/BUGS b/BUGS
index 5d33759..1745b57 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-11-15
+Last updated: 2014-11-18
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -398,9 +398,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1150858 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150858
   virt-sparsify: unknown option `--check-tmpdir=ignore'
 
-1151725 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151725
-  virt-v2v: warning: /files/boot/grub/device.map/hd0 references unknown device "sda" when convert a guest with ide bus
-
 1151739 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151739
   typo error in man page of virt-edit
 
@@ -467,6 +464,24 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1161019 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1161019
   Remove rhev related files(rhsrvany.exe and rhev-apt.exe) after conversion of windows guests to kvm
 
+1164708 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164708
+  set-label can only set <=127 bytes for btrfs and <=126 bytes for ntfs filesystem which not meet the help message. Also for ntfs it should give a warning message when the length >128 bytes
+
+1164729 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164729
+  set-label can only set <=63 bytes for btrfs and ntfs filesystem which not meet the help message. Also for btrfs and ntfs it should give a warning message when the length exceed the limited length
+
+1164734 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164734
+  The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+1164765 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164765
+  [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1164766 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164766
+  [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1164853 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164853
+  Booting in qemu found no volume groups and failed checking the filesystems
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -497,7 +512,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1156298 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1156298
   Remove files in package libguestfs-bash-completion, these files are bash completion files, some of the virt tool completion are already implement in another file, so can remove its completion file
 
-(159 bugs)
+(164 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -509,8 +524,8 @@ You can help by testing the fixes.
 1122557 POST https://bugzilla.redhat.com/show_bug.cgi?id=1122557
   virt-sparsify overwrites block devices if used as output files
 
-1151738 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151738
-  typo error in man page of virt-edit
+1151725 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151725
+  virt-v2v: warning: /files/boot/grub/device.map/hd0 references unknown device "sda" when convert a guest with ide bus
 
 1159651 POST https://bugzilla.redhat.com/show_bug.cgi?id=1159651
   virt-sysprep firstboot script is not deleted if it reboot a RHEL 7 guest
@@ -524,9 +539,6 @@ You can help by testing the fixes.
 1021149 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1021149
   Rebase libguestfs to 1.28 in RHEL 7.1
 
-1100528 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1100528
-  These APIs also need to add to `guestfish -h` command list
-
 1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
   qemu-img shows error message for backing file twice
 
@@ -536,10 +548,7 @@ You can help by testing the fixes.
 1149640 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1149640
   hardcoded el7 disttag in BR makes build fail on ppc64le
 
-1162966 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1162966
-  xfs should also give a warning out to let customer know the limitation
-
-(12 bugs)
+(10 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
@@ -571,6 +580,9 @@ These bugs are in the VERIFIED state.
 1099284 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099284
   typo errors in man pages
 
+1100528 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1100528
+  These APIs also need to add to `guestfish -h` command list
+
 1113020 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1113020
   Support virt-sparsify option to allow specifying temporary file or block device
 
@@ -632,7 +644,7 @@ These bugs are in the VERIFIED state.
   virt-v2v: error: disk sda has no defined format shows when converting xen hvm guest
 
 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"
+  virt-v2v prints warning:WARNING:/files/boot/grub/device.map references unknown device "xvda"
 
 1142008 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142008
   Conversion guest cannot been seen on rhevm server
@@ -709,6 +721,9 @@ These bugs are in the VERIFIED state.
 1151033 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151033
   virt-v2v conversions from VMware vCenter server run slowly
 
+1151738 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151738
+  typo error in man page of virt-edit
+
 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
 
@@ -760,6 +775,18 @@ These bugs are in the VERIFIED state.
 1161575 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1161575
   Failed to import guest with "rtl8139" nic  to openstack server after converted by v2v
 
-(72 bugs)
+1162966 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1162966
+  xfs should also give a warning out to let customer know the limitation
+
+1164619 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164619
+  Inspect-get-icon failed on RHEL7 guest
+
+1164697 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164697
+  typo errors in man pages
+
+1164732 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164732
+  The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+(78 bugs)
 
 End of BUGS file.
diff --git a/configure.ac b/configure.ac
index a334a47..dcb9c452 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], [7])
+m4_define([libguestfs_release], [8])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 4470d4a..0b7ad99 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-11-06 22:06+0000\n"
+"POT-Creation-Date: 2014-11-18 16:50+0000\n"
 "PO-Revision-Date: 2014-10-18 08:01+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -22025,10 +22025,16 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
+#, fuzzy
+#| msgid ""
+#| "This function is used to add additional options to the guest kernel "
+#| "command line."
 msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
 msgstr ""
+"この関数は、追加のオプションを仮想マシンのカーネルコマンドラインに追加するた"
+"めに使用されます。"
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2339 ../src/guestfs-actions.pod:3716
@@ -31830,9 +31836,13 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
+#, fuzzy
+#| msgid ""
+#| "This function is used to add additional options to the guest kernel "
+#| "command line."
 msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
 msgstr ""
 "この関数は、追加のオプションを仮想マシンのカーネルコマンドラインに追加するた"
 "めに使用されます。"
@@ -43258,7 +43268,7 @@ msgstr ""
 #. type: textblock
 #: ../guestfs-release-notes.pod:341
 msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
 "unknown device \"xvda\""
 msgstr ""
 
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index cd3f4b6..faafcd4 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.29.7\n"
+"Project-Id-Version: libguestfs 1.29.8\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-11-15 17:09+0000\n"
+"POT-Creation-Date: 2014-11-18 16:50+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19505,8 +19505,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
 msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
 msgstr ""
 
 #. type: textblock
@@ -28575,8 +28575,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
 msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
 msgstr ""
 
 #. type: textblock
@@ -39104,7 +39104,7 @@ msgstr ""
 #. type: textblock
 #: ../guestfs-release-notes.pod:341
 msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
 "unknown device \"xvda\""
 msgstr ""
 
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 4a1586d..0d98109 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-11-06 22:06+0000\n"
+"POT-Creation-Date: 2014-11-18 16:50+0000\n"
 "PO-Revision-Date: 2014-10-18 08:01+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -21874,8 +21874,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
 msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
 msgstr ""
 
 #. type: textblock
@@ -31414,10 +31414,12 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
+#, fuzzy
+#| msgid "Pass additional options to the guest kernel."
 msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
-msgstr ""
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
+msgstr "Передати додаткові параметри ядру гостьової системи."
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:6637 ../src/guestfs-actions.pod:10863
@@ -42396,7 +42398,7 @@ msgstr "L<https://bugzilla.redhat.com/1142004>"
 #. type: textblock
 #: ../guestfs-release-notes.pod:341
 msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
 "unknown device \"xvda\""
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index cf0ea7c..6102caf 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7040,37 +7056,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8088,7 +8104,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 89ee844..d4852f0 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -49,7 +49,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -607,7 +607,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -712,11 +712,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -734,7 +734,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -758,11 +758,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -956,11 +956,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1042,7 +1042,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1158,7 +1158,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1226,7 +1226,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1285,7 +1285,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1321,7 +1321,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1352,11 +1352,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1986,11 +1986,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2221,7 +2221,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2261,7 +2261,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2338,7 +2338,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2352,7 +2352,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2392,11 +2392,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2553,7 +2553,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2573,11 +2573,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2609,7 +2609,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2633,7 +2633,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2645,7 +2645,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2713,7 +2713,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2723,7 +2723,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2773,7 +2773,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2790,6 +2790,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2831,7 +2843,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2847,7 +2859,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2891,7 +2903,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2991,7 +3003,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3009,7 +3021,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3058,6 +3070,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3172,13 +3188,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7161,37 +7177,37 @@ msgstr "%s: xmlOutputBufferCreateFd: falló al abrir stdout\n"
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr "%s: xmlNewTextWriter: falló al crear escritor libxml2\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8213,7 +8229,7 @@ msgstr "el tamaño de %s es irracionalmente largo (%<PRIi64> bytes)"
 msgid "could not parse integer in version number: %s"
 msgstr "no se pudo analizar el entero en el número de la versión: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr "read: %s: fin de archivo no esperado"
diff --git a/po/gu.po b/po/gu.po
index 9009537..ec3d09d 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -48,7 +48,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -695,7 +695,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -711,11 +711,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -757,11 +757,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1157,7 +1157,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1284,7 +1284,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1320,7 +1320,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1351,11 +1351,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1985,11 +1985,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2220,7 +2220,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2260,7 +2260,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2337,7 +2337,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2351,7 +2351,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2391,11 +2391,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2552,7 +2552,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2572,11 +2572,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2608,7 +2608,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2632,7 +2632,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2644,7 +2644,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2712,7 +2712,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2722,7 +2722,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2789,6 +2789,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2830,7 +2842,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2846,7 +2858,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2890,7 +2902,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2990,7 +3002,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3008,7 +3020,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3057,6 +3069,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3171,13 +3187,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7017,37 +7033,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8065,7 +8081,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index f53f0db..9cc26c2 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -48,7 +48,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -695,7 +695,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -711,11 +711,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -757,11 +757,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1157,7 +1157,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1284,7 +1284,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1320,7 +1320,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1351,11 +1351,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1985,11 +1985,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2220,7 +2220,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2260,7 +2260,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2337,7 +2337,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2351,7 +2351,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2391,11 +2391,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2552,7 +2552,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2572,11 +2572,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2608,7 +2608,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2632,7 +2632,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2644,7 +2644,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2712,7 +2712,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2722,7 +2722,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2789,6 +2789,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2830,7 +2842,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2846,7 +2858,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2890,7 +2902,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2990,7 +3002,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3008,7 +3020,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3057,6 +3069,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3171,13 +3187,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7015,37 +7031,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8063,7 +8079,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 2711a2a..5466794 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7019,37 +7035,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8067,7 +8083,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 6cd6914..69a42cb 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.29.7\n"
+"Project-Id-Version: libguestfs 1.29.8\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -72,7 +72,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -604,7 +604,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -683,7 +683,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -693,7 +693,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -709,11 +709,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -755,11 +755,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -901,7 +901,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -953,11 +953,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1039,7 +1039,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1137,7 +1137,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1155,7 +1155,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1223,7 +1223,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1282,7 +1282,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1318,7 +1318,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1349,11 +1349,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1983,11 +1983,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2218,7 +2218,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2258,7 +2258,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2335,7 +2335,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2349,7 +2349,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2389,11 +2389,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2550,7 +2550,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2570,11 +2570,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2606,7 +2606,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2630,7 +2630,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2642,7 +2642,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2710,7 +2710,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2720,7 +2720,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2770,7 +2770,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2787,6 +2787,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2828,7 +2840,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2844,7 +2856,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2888,7 +2900,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2988,7 +3000,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3006,7 +3018,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3055,6 +3067,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3169,13 +3185,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7005,37 +7021,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8053,7 +8069,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 16a017f..3494762 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7017,37 +7033,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8065,7 +8081,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 10f65a1..43f6867 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -48,7 +48,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -695,7 +695,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -711,11 +711,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -757,11 +757,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1157,7 +1157,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1284,7 +1284,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1320,7 +1320,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1351,11 +1351,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1985,11 +1985,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2220,7 +2220,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2260,7 +2260,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2337,7 +2337,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2351,7 +2351,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2391,11 +2391,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2552,7 +2552,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2572,11 +2572,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2608,7 +2608,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2632,7 +2632,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2644,7 +2644,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2712,7 +2712,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2722,7 +2722,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2789,6 +2789,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2830,7 +2842,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2846,7 +2858,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2890,7 +2902,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2990,7 +3002,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3008,7 +3020,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3057,6 +3069,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3171,13 +3187,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7084,37 +7100,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout उघडण्यास अपय
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr "%s: xmlNewTextWriter: libxml2 राइटर निर्माण करण्यास अपयशी\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8132,7 +8148,7 @@ msgstr "%s चे आकार असमंजसपणे मोठे आह
 msgid "could not parse integer in version number: %s"
 msgstr "आवृत्ती क्रमांत इंटिजर वाचणे अशक्य: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index b4d9b4a..3b144c5 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -49,7 +49,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -607,7 +607,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -712,11 +712,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -734,7 +734,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -758,11 +758,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -956,11 +956,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1042,7 +1042,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1158,7 +1158,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1226,7 +1226,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1285,7 +1285,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1321,7 +1321,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1352,11 +1352,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1986,11 +1986,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2221,7 +2221,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2261,7 +2261,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2338,7 +2338,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2352,7 +2352,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2392,11 +2392,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2553,7 +2553,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2573,11 +2573,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2609,7 +2609,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2633,7 +2633,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2645,7 +2645,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2713,7 +2713,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2723,7 +2723,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2773,7 +2773,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2790,6 +2790,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2831,7 +2843,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2847,7 +2859,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2891,7 +2903,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2991,7 +3003,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3009,7 +3021,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3058,6 +3070,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3172,13 +3188,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7194,37 +7210,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout openen mislukte\n"
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr "%s: xmlNewTextWriter: libxml2 schrijver aanmaken mislukte\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr "%s: kan XML niet van stdin parsen\n"
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr "%s: kan geen nieuwe XPath context creëren\n"
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr "%s: niet in staat XPath expressie te evalueren\n"
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr "%s: xmlSaveToFd mislukte\n"
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr "%s: xmlNewDoc mislukte\n"
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr "%s: xmlCopyNode mislukte\n"
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr "%s: xmlSaveDoc mislukte\n"
@@ -8263,7 +8279,7 @@ msgstr "groote van %s is buitensporig groot (%<PRIi64> bytes)"
 msgid "could not parse integer in version number: %s"
 msgstr "kon integer in versie nummer niet ontleden: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr "lezen: %s: onverwacht einde van bestand"
diff --git a/po/or.po b/po/or.po
index 20dac49..37c15b7 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7015,37 +7031,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8063,7 +8079,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index af403ad..b3dbbda 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -48,7 +48,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -695,7 +695,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -711,11 +711,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -757,11 +757,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -903,7 +903,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1041,7 +1041,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1157,7 +1157,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1284,7 +1284,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1320,7 +1320,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1351,11 +1351,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1985,11 +1985,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2220,7 +2220,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2260,7 +2260,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2337,7 +2337,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2351,7 +2351,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2391,11 +2391,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2552,7 +2552,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2572,11 +2572,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2608,7 +2608,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2632,7 +2632,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2644,7 +2644,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2712,7 +2712,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2722,7 +2722,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2772,7 +2772,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2789,6 +2789,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2830,7 +2842,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2846,7 +2858,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2890,7 +2902,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2990,7 +3002,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3008,7 +3020,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3057,6 +3069,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3171,13 +3187,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7081,37 +7097,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout ਨੂੰ ਖੋਲਣ ਤੋਂ ਫ
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr "%s: xmlNewTextWriter: libxml2 ਰਾਈਟਰ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8129,7 +8145,7 @@ msgstr "%s ਦਾ ਅਕਾਰ ਬੇਲੋੜਾ ਹੈ (%<PRIi64> ਬਾਈਟ
 msgid "could not parse integer in version number: %s"
 msgstr "ਵਰਜਨ ਨੰਬਰ ਵਿੱਚ ਪੂਰਨਅੰਕ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0120481..f44f1e3 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -51,7 +51,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -609,7 +609,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -698,7 +698,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -714,11 +714,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -736,7 +736,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -760,11 +760,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -906,7 +906,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -958,11 +958,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1044,7 +1044,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1142,7 +1142,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1160,7 +1160,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1228,7 +1228,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1287,7 +1287,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1323,7 +1323,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1354,11 +1354,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1988,11 +1988,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2223,7 +2223,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2340,7 +2340,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2354,7 +2354,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2394,11 +2394,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2555,7 +2555,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2575,11 +2575,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2611,7 +2611,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -2635,7 +2635,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2647,7 +2647,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2715,7 +2715,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2725,7 +2725,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2775,7 +2775,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2792,6 +2792,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2833,7 +2845,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2849,7 +2861,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2893,7 +2905,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2993,7 +3005,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3011,7 +3023,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3060,6 +3072,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3174,13 +3190,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7212,37 +7228,37 @@ msgstr ""
 "%s: xmlNewTextWriter: utworzenie modułu zapisującego libxml2 się nie "
 "powiodło\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr "%s: nie można przetworzyć XML ze standardowego wejścia\n"
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr "%s: nie można utworzyć nowego kontekstu XPath\n"
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr "%s: nie można sprawdzić wyrażenia XPath\n"
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr "%s: xmlSaveToFd się nie powiodło\n"
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr "%s: xmlNewDoc się nie powiodło\n"
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr "%s: xmlCopyNode się nie powiodło\n"
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr "%s: xmlSaveDoc się nie powiodło\n"
@@ -8287,7 +8303,7 @@ msgstr "rozmiar %s jest nierozsądnie duży (%<PRIi64> bajtów)"
 msgid "could not parse integer in version number: %s"
 msgstr "nie można przetworzyć liczby całkowitej w numerze wersji: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr "odczyt: %s: nieoczekiwany koniec pliku"
diff --git a/po/ta.po b/po/ta.po
index 3216dcc..c33418c 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7016,37 +7032,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8064,7 +8080,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 2586358..b666c57 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -47,7 +47,7 @@ msgstr ""
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr ""
 
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr ""
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgstr ""
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr ""
 
@@ -710,11 +710,11 @@ msgstr ""
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr ""
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr ""
 
@@ -732,7 +732,7 @@ msgstr ""
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr ""
 
@@ -756,11 +756,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr ""
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid "Downloading: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Ignore partition"
 msgstr ""
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr ""
 
@@ -1156,7 +1156,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr ""
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr ""
 
@@ -1224,7 +1224,7 @@ msgstr ""
 msgid "Map network 'in' to 'out'"
 msgstr ""
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 
@@ -1283,7 +1283,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr ""
 
@@ -1319,7 +1319,7 @@ msgstr ""
 msgid "Output vol UUID(s)"
 msgstr ""
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr ""
 
@@ -1350,11 +1350,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -1984,11 +1984,11 @@ msgid ""
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2219,7 +2219,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr ""
 
@@ -2259,7 +2259,7 @@ msgstr ""
 msgid "could not parse '-ic %s'.  Original error message was: %s"
 msgstr ""
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 msgid "discard/trim is not supported: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2350,7 +2350,7 @@ msgid ""
 "format"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2390,11 +2390,11 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2551,7 +2551,7 @@ msgstr ""
 msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr ""
 
@@ -2571,11 +2571,11 @@ msgstr ""
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr ""
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr ""
 
@@ -2607,7 +2607,7 @@ msgstr ""
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 msgid ""
 "libguestfs thinks this is not an installed operating system (it might be, "
 "for example, an installer disk or live CD).  If this is wrong, it is "
@@ -2631,7 +2631,7 @@ msgid ""
 "you need to rerun virt-v2v as root."
 msgstr ""
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -2643,7 +2643,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr ""
 
@@ -2711,7 +2711,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr ""
 
@@ -2721,7 +2721,7 @@ msgid ""
 "fail when it tries to read the source disks."
 msgstr ""
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -2771,7 +2771,7 @@ msgstr ""
 msgid "output '%s' cannot be a character device, it must be a regular file"
 msgstr ""
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -2788,6 +2788,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr ""
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 
@@ -2889,7 +2901,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -2989,7 +3001,7 @@ msgid ""
 "The guest will be configured to use a slower emulated device."
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr ""
 
@@ -3007,7 +3019,7 @@ msgid ""
 "conf"
 msgstr ""
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3056,6 +3068,10 @@ msgstr ""
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr ""
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3170,13 +3186,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 
@@ -7013,37 +7029,37 @@ msgstr ""
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
@@ -8061,7 +8077,7 @@ msgstr ""
 msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 371710a..0700361 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-11-15 17:08+0000\n"
+"POT-Creation-Date: 2014-11-18 16:49+0000\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/"
@@ -54,7 +54,7 @@ msgstr "%s"
 #. ../customize/customize_main.ml:238
 #. ../builder/get_kernel.ml:52
 #. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
 msgid "%s (ignored)"
 msgstr "%s (проігноровано)"
 
@@ -90,7 +90,7 @@ msgstr ""
 msgid "%s option used more than once on the command line"
 msgstr "у командному рядку параметр %s використано декілька разів"
 
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1318
 msgid ""
 "%s references unknown device \"%s\".  You may have to fix this entry "
 "manually after conversion."
@@ -737,7 +737,7 @@ msgstr "-o vdsm: не вказано сховище виведення дани
 msgid "-os %s: output directory does not exist or is not a directory"
 msgstr "-os %s: каталогу виведення даних не існує або вказано не каталог"
 
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
 msgid "<disk type='%s'> was ignored"
 msgstr "<disk type='%s'> проігноровано"
 
@@ -823,7 +823,7 @@ msgstr "Перевірити числові підписи"
 msgid "Check there is enough space in $TMPDIR"
 msgstr "Перевірити, чи достатньо місця у $TMPDIR"
 
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
 msgid "Checking for sufficient free disk space in the guest"
 msgstr "Перевіряємо, чи достатньо вільного місця на диску гостьової системи"
 
@@ -835,7 +835,7 @@ msgstr ""
 "Спорожнюємо резервну пам’ять Linux на %s…\n"
 "%!"
 
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
 msgid "Closing the overlay"
 msgstr "Закриваємо оверлей"
 
@@ -851,11 +851,11 @@ msgstr "Стиснутий формат виведення даних"
 msgid "Converting %s to %s"
 msgstr "Перетворюємо %s на %s"
 
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
 msgid "Converting %s to run on KVM"
 msgstr "Перетворюємо %s для уможливлення запуску у KVM"
 
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
 msgid "Converting the guest to run on KVM"
 msgstr "Перетворюємо гостьову систему для запуску у KVM"
 
@@ -875,7 +875,7 @@ msgstr "Копіювання"
 msgid "Copying %s"
 msgstr ""
 
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
 msgid "Copying disk %d/%d to %s (%s)"
 msgstr "Копіювання диска %d з %d на %s (%s)"
 
@@ -903,11 +903,11 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr "Створювати символічні посилання"
 
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
 msgid "Creating an overlay to protect the source from being modified"
 msgstr "Створюємо оверлей для захисту джерела від внесення змін"
 
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
 msgid "Creating output metadata"
 msgstr "Створюємо метадані результатів"
 
@@ -1059,7 +1059,7 @@ msgstr "Розмір отриманого:"
 msgid "Downloading: %s"
 msgstr "Отримуємо: %s"
 
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
 msgid ""
 "Dual- or multi-boot operating system detected.  Choose the root filesystem\n"
 "that contains the main operating system from the list below:\n"
@@ -1111,11 +1111,11 @@ msgstr "Увімкнути трасування викликів libguestfs"
 msgid "Enable/disable specific operations"
 msgstr "Увімкнути або вимкнути специфічні операції"
 
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
 msgid "Enter a number between 1 and %d, or 'exit': "
 msgstr ""
 
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
 msgid "Estimating space required on target for each disk"
 msgstr "Оцінюємо простір, потрібний у системі призначення для кожного з дисків"
 
@@ -1208,7 +1208,7 @@ msgstr "Відбиток чинного ключа підписування"
 msgid "Fingerprint: %s\n"
 msgstr "Відбиток: %s\n"
 
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
 #: ../builder/builder.ml:696
 msgid "Finishing off"
 msgstr "Завершуємо"
@@ -1317,7 +1317,7 @@ msgstr "Ігнорувати файлову систему"
 msgid "Ignore partition"
 msgstr "Ігнорувати розділ"
 
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
 msgid "Initializing the target %s"
 msgstr "Ініціалізуємо призначення %s"
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Input format (for -i disk)"
 msgstr "Формат вхідних даних (для -i диск)"
 
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
 msgid "Inspecting the overlay"
 msgstr "Вивчаємо оверлей"
 
@@ -1405,7 +1405,7 @@ msgstr "Відобразити місток «in» на «out»"
 msgid "Map network 'in' to 'out'"
 msgstr "Відобразити мережу «in» на «out»"
 
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
 msgid "Mapping filesystem data to avoid copying unused and blank areas"
 msgstr ""
 "Виконуємо прив’язку даних файлової системи для уникнення копіювання "
@@ -1477,7 +1477,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr "Відкриваємо новий диск"
 
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
 msgid "Opening the overlay"
 msgstr "Відкриваємо оверлей"
 
@@ -1513,7 +1513,7 @@ msgstr "Розмір виведення"
 msgid "Output vol UUID(s)"
 msgstr "UUID виведених томів"
 
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
 msgid "Overlay saved as %s [--debug-overlays]\n"
 msgstr "Оверлей збережено як %s [--debug-overlays]\n"
 
@@ -1544,11 +1544,11 @@ msgstr "Нотатки POD для %s не повинні завершувати
 msgid "Perform a dry run"
 msgstr "Виконати тестовий запуск"
 
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
 msgid "Picked %s because '--root %s' was used."
 msgstr ""
 
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
 msgid "Picked %s because '--root first' was used."
 msgstr ""
 
@@ -2298,11 +2298,11 @@ msgstr ""
 "тому не є частиною віртуальної машини на диску, але ці дані зберігаються\n"
 "на диску у старіших версіях дистрибутивів."
 
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
 msgid "This guest does not have virtio drivers installed."
 msgstr ""
 
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
@@ -2578,7 +2578,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
 msgid "connection closed"
 msgstr "з'єднання закрито"
 
@@ -2624,7 +2624,7 @@ msgstr ""
 "не вдалося обробити параметр «-ic %s». Початкове повідомлення щодо помилки: "
 "%s"
 
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:239
 msgid "could not parse disk rasd:HostResource from OVF document"
 msgstr "не вдалося обробити значення rasd:HostResource диска з документа OVF"
 
@@ -2711,7 +2711,7 @@ msgstr "заборонений символ (%c) у назві операції"
 msgid "discard/trim is not supported: %s"
 msgstr "підтримки відкидання або обрізання не передбачено: %s"
 
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
 msgid ""
 "disk %s (%s) has no defined format.\n"
 "\n"
@@ -2736,7 +2736,7 @@ msgstr ""
 "використати параметр «-of» для примусового визначення формату виведення "
 "даних."
 
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
 msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
 msgstr ""
 
@@ -2782,11 +2782,11 @@ msgstr ""
 "Помилка під час обробки адреси «%s». Ознайомтеся з повідомленнями щодо "
 "помилок, які виведено раніше."
 
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:207
 msgid "error parsing disk fileRef"
 msgstr ""
 
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:225
 msgid "error uncompressing %s, see earlier error messages"
 msgstr ""
 
@@ -2956,7 +2956,7 @@ msgstr ""
 "у метаданих XML libvirt пропущено <domain type='...'> або вказано порожнє "
 "значення"
 
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
 msgid "in the libvirt XML metadata, <name> is missing or empty"
 msgstr "у метаданих XML libvirt пропущено <name> або вказано порожнє значення"
 
@@ -2976,11 +2976,11 @@ msgstr "внутрішня помилка: помилка оцінки у %s, р
 msgid "internal error: invalid argument: %s"
 msgstr "внутрішня помилка: некоректний аргумент: %s"
 
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
 msgid "internal error: qemu corrupted the overlay file"
 msgstr "внутрішня помилка: файл оверлею пошкоджено qemu"
 
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
 msgid "internal error: qemu-img did not create overlay with backing file"
 msgstr "внутрішня помилка: qemu-img не створено оверлею із резервним файлом"
 
@@ -3012,7 +3012,7 @@ msgstr "ядро %s перебуває поза ієрархією grub %s"
 msgid "libguestfs error: %s"
 msgstr "помилка libguestfs: %s"
 
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
 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 "
@@ -3045,7 +3045,7 @@ msgstr ""
 "того, можливо, вам слід повторно запустити virt-v2v від імені користувача "
 "root."
 
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
 msgid ""
 "multi-boot operating systems are not supported by virt-v2v. Use the --root "
 "option to change how virt-v2v handles this."
@@ -3060,7 +3060,7 @@ msgid ""
 "twice"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
 msgid "network <disk> with <source protocol='%s'> was ignored"
 msgstr "мережу <disk> з <source protocol='%s'> проігноровано"
 
@@ -3138,7 +3138,7 @@ msgid ""
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
 msgid "no root device found in this operating system image."
 msgstr "у цьому образі операційної системи не знайдено кореневого пристрою."
 
@@ -3150,7 +3150,7 @@ msgstr ""
 "немає підтримки віддалених з’єднань libvirt з «-ic %s». Перетворення може "
 "призвести до помилок під час спроб прочитати диски джерел даних."
 
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
 msgid ""
 "not enough free space for conversion on filesystem '%s'.  %Ld bytes free < "
 "%Ld bytes needed"
@@ -3208,7 +3208,7 @@ msgstr ""
 "виведенням «%s» не може бути символьний пристрій, виводити дані можна лише "
 "до звичайного файла"
 
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
 msgid ""
 "output format should be 'raw' or 'qcow2'.\n"
 "\n"
@@ -3232,6 +3232,18 @@ msgid ""
 "block device = %s, output block device size = %s"
 msgstr ""
 
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova hard disk has an unknown VMware controller type (%d), please report this "
+"as a bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova hard disk has no parent controller, please report this as a bug "
+"supplying the *.ovf file extracted from the ova"
+msgstr ""
+
 #: ../v2v/convert_linux.ml:154
 msgid "package '%s' contains no files"
 msgstr ""
@@ -3279,7 +3291,7 @@ msgstr ""
 "pwrite: незавершений запис під час відновлення заголовка розділу резервної "
 "пам’яті"
 
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
 msgid "qemu-img command failed, see earlier errors"
 msgstr ""
 "помилка під час спроби виконати qemu-img, див. попередні повідомлення щодо "
@@ -3298,7 +3310,7 @@ msgstr ""
 msgid "resize2fs"
 msgstr "resize2fs"
 
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
 msgid "root device %s not found.  Roots found were: %s"
 msgstr ""
 "не знайдено кореневого пристрою %s. Знайдено такі кореневі пристрої: %s"
@@ -3343,7 +3355,7 @@ msgstr ""
 msgid "source disk has <source dev=...> attribute in XML"
 msgstr ""
 
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
 msgid "source has no hard disks!"
 msgstr ""
 
@@ -3468,7 +3480,7 @@ msgstr ""
 "Гостьову систему буде налаштовано на використання повільнішого емульованого "
 "пристрою."
 
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
 msgid "this guest has no non-removable disks"
 msgstr "у цій гостьовій системі немає непортативних дисків"
 
@@ -3488,7 +3500,7 @@ msgstr ""
 "не вдалося знайти жодного коректного файла налаштувань modprobe, зокрема /"
 "etc/modprobe.conf"
 
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
 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 "
@@ -3546,6 +3558,10 @@ msgstr "невідомий параметр -oa: %s"
 msgid "unknown guest operating system: %s %s %d.%d (%s)"
 msgstr "невідома гостьова операційна система: %s %s %d.%d (%s)"
 
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
 #: ../resize/resize.ml:564
 msgid "unknown/unavailable method for expanding filesystem %s"
 msgstr ""
@@ -3664,13 +3680,13 @@ msgstr ""
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
 msgid ""
 "virt-v2v does not support local displays, so <graphics type='%s'> in the "
 "input libvirt XML was ignored"
 msgstr ""
 
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
 msgid "virt-v2v is unable to convert this guest type (%s/%s)"
 msgstr ""
 "virt-v2v не може виконувати перетворення цього типу гостьових систем (%s/%s)"
@@ -8100,37 +8116,37 @@ msgstr "%s: xmlOutputBufferCreateFd: не вдалося відкрити stdout
 msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr "%s: xmlNewTextWriter: не вдалося створити процес запису libxml2\n"
 
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
 #, c-format
 msgid "%s: unable to parse XML from stdin\n"
 msgstr "%s: не вдалося обробити код XML з stdin\n"
 
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
 #, c-format
 msgid "%s: unable to create new XPath context\n"
 msgstr "%s: не вдалося створити контекст XPath\n"
 
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
 #, c-format
 msgid "%s: unable to evaluate XPath expression\n"
 msgstr "%s: не вдалося обробити вираз XPath\n"
 
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
 #, c-format
 msgid "%s: xmlSaveToFd failed\n"
 msgstr "%s: помилка xmlSaveToFd\n"
 
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
 #, c-format
 msgid "%s: xmlNewDoc failed\n"
 msgstr "%s: помилка xmlNewDoc\n"
 
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
 #, c-format
 msgid "%s: xmlCopyNode failed\n"
 msgstr "%s: помилка xmlCopyNode\n"
 
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
 #, c-format
 msgid "%s: xmlSaveDoc failed\n"
 msgstr "%s: помилка xmlSaveDoc\n"
@@ -9336,7 +9352,7 @@ msgstr "розмір %s неймовірно великий (%<PRIi64> байт
 msgid "could not parse integer in version number: %s"
 msgstr "не вдалося обробити ціле число у номері версії: %s"
 
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
 #, c-format
 msgid "read: %s: unexpected end of file"
 msgstr "читання: %s: неочікуваний кінець файла"

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



More information about the Pkg-libvirt-commits mailing list