[Pkg-libvirt-commits] [libguestfs] 85/179: Version 1.27.64.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 31 19:08:27 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 6e5039d1ef69acf38b2cdbd3d4b634887ae00979
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Oct 17 17:38:07 2014 +0100
Version 1.27.64.
---
BUGS | 39 +++++-
configure.ac | 2 +-
po-docs/ja.po | 306 ++++++++++++++++++++++++++++++-------------
po-docs/libguestfs-docs.pot | 302 ++++++++++++++++++++++++++++++-------------
po-docs/uk.po | 308 +++++++++++++++++++++++++++++++-------------
po/en_GB.po | 100 +++++++-------
po/es.po | 100 +++++++-------
po/gu.po | 100 +++++++-------
po/hi.po | 100 +++++++-------
po/kn.po | 100 +++++++-------
po/libguestfs.pot | 102 ++++++++-------
po/ml.po | 100 +++++++-------
po/mr.po | 100 +++++++-------
po/nl.po | 100 +++++++-------
po/or.po | 100 +++++++-------
po/pa.po | 100 +++++++-------
po/pl.po | 100 +++++++-------
po/ta.po | 100 +++++++-------
po/te.po | 100 +++++++-------
po/uk.po | 100 +++++++-------
20 files changed, 1472 insertions(+), 987 deletions(-)
diff --git a/BUGS b/BUGS
index 827d86b..9506549 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-10-15
+Last updated: 2014-10-17
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -470,6 +470,27 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1152998 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152998
virt-v2v / qemu-img fails on ova image
+1153411 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153411
+ copy-in and copy-out copy symbolic link file problems, it only copy the link property not the real file
+
+1153412 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153412
+ copy-in and copy-out copy symbolic link file problems, it only copy the link property not the real file
+
+1153589 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153589
+ virt-v2v will hang when converting esx guest before disk copy phase
+
+1153702 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153702
+ Using "upload - XXX" doesn't work with remote
+
+1153844 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153844
+ Redundancy whitespace at the end of directory name when use <TAB> to complete the directory name in guestfish with a xfs filesystem in guest
+
+1153846 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153846
+ Redundancy whitespace at the end of directory name when use <TAB> to complete the directory name in guestfish with a xfs filesystem in guest
+
+1153974 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1153974
+ guestfish prints 'n' in error message
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -497,10 +518,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1145908 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145908
No virtio drivers available warning shows when converting win8 guest
-1145916 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
- virt-v2v fails to convert win7 guest
-
-(160 bugs)
+(166 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -512,6 +530,9 @@ 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
+1145916 POST https://bugzilla.redhat.com/show_bug.cgi?id=1145916
+ virt-v2v fails to convert win7 guest
+
1151738 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151738
typo error in man page of virt-edit
@@ -524,6 +545,12 @@ You can help by testing the fixes.
1151910 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151910
virt-ls should remove '/' in the output when specify the directory name as /etc/
+1153515 POST https://bugzilla.redhat.com/show_bug.cgi?id=1153515
+ empty (but set) LIBGUESTFS_BACKEND prints libguestfs: error: invalid backend:
+
+1153730 POST https://bugzilla.redhat.com/show_bug.cgi?id=1153730
+ Booting windows 2008 R2 if=virtio gets BSOD
+
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
@@ -605,7 +632,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
-(33 bugs)
+(36 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index 2371bd6..d2b5089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [27])
-m4_define([libguestfs_release], [63])
+m4_define([libguestfs_release], [64])
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 7688d07..5358926 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-10-15 22:18+0300\n"
+"POT-Creation-Date: 2014-10-17 17:36+0200\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -1423,7 +1423,7 @@ msgstr ""
#. type: =item
#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286
-#: ../v2v/virt-v2v.pod:985
+#: ../v2v/virt-v2v.pod:1047
msgid "1"
msgstr "1"
@@ -1434,7 +1434,7 @@ msgstr "ディスクイメージまたは仮想マシンのスキャン中にエ
#. type: =item
#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290
-#: ../v2v/virt-v2v.pod:989
+#: ../v2v/virt-v2v.pod:1051
msgid "2"
msgstr "2"
@@ -1488,7 +1488,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4750
#: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1260
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1310
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1528,7 +1528,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1276
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1326
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1559,7 +1559,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4814
#: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1286
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1336
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1889,7 +1889,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642
#: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:1197
+#: ../v2v/virt-v2v.pod:1259
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1928,7 +1928,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4810
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1274
+#: ../v2v/virt-v2v.pod:1324
msgid "AUTHORS"
msgstr "著者"
@@ -1959,7 +1959,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1288
+#: ../v2v/virt-v2v.pod:1338
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2899,7 +2899,7 @@ msgstr ""
#: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
#: ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101
#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:890
-#: ../v2v/virt-v2v.pod:1159
+#: ../v2v/virt-v2v.pod:1221
msgid "1."
msgstr "1."
@@ -2919,7 +2919,7 @@ msgstr ""
#: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
#: ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105
#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:904
-#: ../v2v/virt-v2v.pod:1166
+#: ../v2v/virt-v2v.pod:1228
msgid "2."
msgstr "2."
@@ -2938,7 +2938,7 @@ msgstr ""
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
#: ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:912
-#: ../v2v/virt-v2v.pod:1172
+#: ../v2v/virt-v2v.pod:1234
msgid "3."
msgstr "3."
@@ -5368,7 +5368,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1124
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1186
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5403,7 +5403,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1145
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1207
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5452,7 +5452,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1220
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1270
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5466,7 +5466,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1225
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1275
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5474,13 +5474,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1228
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1278
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1232
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1282
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5495,7 +5495,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1239
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1289
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8646,7 +8646,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1258
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1308
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8786,7 +8786,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72
#: ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:1183
+#: ../v2v/virt-v2v.pod:1245
msgid "FILES"
msgstr "ファイル"
@@ -53791,7 +53791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1278
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1328
msgid "Matthew Booth"
msgstr ""
@@ -55866,7 +55866,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:1130
+#: ../v2v/virt-v2v.pod:1192
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -55899,7 +55899,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:1152
+#: ../v2v/virt-v2v.pod:1214
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -55907,13 +55907,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:1155
+#: ../v2v/virt-v2v.pod:1217
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:1161
+#: ../v2v/virt-v2v.pod:1223
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -55921,7 +55921,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:1164
+#: ../v2v/virt-v2v.pod:1226
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -55932,7 +55932,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:1168
+#: ../v2v/virt-v2v.pod:1230
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -56813,7 +56813,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1203
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1265
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -56827,7 +56827,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1206
+#: ../sparsify/virt-sparsify.pod:407
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -56835,7 +56835,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1210
+#: ../sparsify/virt-sparsify.pod:411
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -56850,7 +56850,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1218
+#: ../sparsify/virt-sparsify.pod:419
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -91701,16 +91701,145 @@ msgstr ""
#. type: =head1
#: ../v2v/virt-v2v.pod:969
-msgid "POST-CONVERSION TASKS"
+msgid "RESOURCE REQUIREMENTS"
msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:971
+#, fuzzy
+#| msgid "network"
+msgid "Network"
+msgstr "network"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:973
+msgid ""
+"The most important resource for virt-v2v appears to be network bandwidth. "
+"Virt-v2v should be able to copy guest data at gigabit ethernet speeds or "
+"greater."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:977
+msgid ""
+"Ensure that the network connections between servers (conversion server, NFS "
+"server, vCenter, Xen) are as fast and as low latency as possible."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:981
+msgid "Disk space"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:983
+msgid ""
+"Virt-v2v places potentially large temporary files in C<$TMPDIR> (which is C</"
+"var/tmp> if you don't set it). Using tmpfs is a bad idea."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:986
+msgid ""
+"For each guest disk, an overlay is stored temporarily. This stores the "
+"changes made during conversion, and is used as a cache. The overlays are "
+"not particularly large - tens or low hundreds of megabytes per disk is "
+"typical. In addition to the overlay(s), input and output methods may use "
+"disk space, as outlined in the table below."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:994
+msgid "I<-i ova>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:996
+msgid ""
+"This temporarily places a full copy of the uncompressed source disks in C<"
+"$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:999
+#, fuzzy
+#| msgid "B<-o kernel_cache>"
+msgid "I<-o glance>"
+msgstr "B<-o kernel_cache>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1001 ../v2v/virt-v2v.pod:1012
+msgid "This temporarily places a full copy of the output disks in C<$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1003
+msgid "I<-o local>"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1005
+msgid "I<-o qemu>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1007
+msgid ""
+"You must ensure there is sufficient space in the output directory for the "
+"converted guest."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1010
+msgid "I<-o null>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1016
+msgid "VMware vCenter resources"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1018
+msgid ""
+"Copying from VMware vCenter is currently quite slow, but we believe this to "
+"be an issue with VMware. Ensuring the VMware ESXi hypervisor and vCenter "
+"guest are running on fast hardware with plenty of memory should alleviate "
+"this."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1023
+msgid "Compute power and RAM"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1025
+msgid ""
+"Virt-v2v is not especially compute or RAM intensive. If you are running "
+"many parallel conversions, then you may consider allocating one CPU core and "
+"512 MB - 1 GB of RAM per running instance."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1029
+#, fuzzy
+#| msgid "virt-ls - List files in a virtual machine"
+msgid "Virt-v2v can be run in a virtual machine."
+msgstr "virt-ls - 仮想マシンのファイルの一覧表示"
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:1031
+msgid "POST-CONVERSION TASKS"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1033
msgid "Guest network configuration"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:1035
msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
@@ -91718,29 +91847,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:978
+#: ../v2v/virt-v2v.pod:1040
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:980
+#: ../v2v/virt-v2v.pod:1042
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:1049
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:991
+#: ../v2v/virt-v2v.pod:1053
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:995
+#: ../v2v/virt-v2v.pod:1057
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -91748,7 +91877,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:999
+#: ../v2v/virt-v2v.pod:1061
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -91756,12 +91885,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:1003
+#: ../v2v/virt-v2v.pod:1065
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1005
+#: ../v2v/virt-v2v.pod:1067
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -91769,7 +91898,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1072
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -91781,12 +91910,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1018
+#: ../v2v/virt-v2v.pod:1080
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1020
+#: ../v2v/virt-v2v.pod:1082
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -91794,19 +91923,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1026
+#: ../v2v/virt-v2v.pod:1088
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1090
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1031
+#: ../v2v/virt-v2v.pod:1093
msgid ""
"You can avoid needing root here by mounting it yourself before running virt-"
"v2v, and passing I<-os /mountpoint> instead, but first of all read the next "
@@ -91814,12 +91943,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1035
+#: ../v2v/virt-v2v.pod:1097
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1099
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the UID:"
@@ -91827,7 +91956,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1041
+#: ../v2v/virt-v2v.pod:1103
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as non-"
@@ -91836,12 +91965,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1046
+#: ../v2v/virt-v2v.pod:1108
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1048
+#: ../v2v/virt-v2v.pod:1110
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -91849,7 +91978,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1115
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -91857,12 +91986,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1120
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1060
+#: ../v2v/virt-v2v.pod:1122
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -91870,12 +91999,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1067
+#: ../v2v/virt-v2v.pod:1129
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1069
+#: ../v2v/virt-v2v.pod:1131
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -91884,14 +92013,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1074
+#: ../v2v/virt-v2v.pod:1136
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1078
+#: ../v2v/virt-v2v.pod:1140
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -91903,19 +92032,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1087
+#: ../v2v/virt-v2v.pod:1149
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1089
+#: ../v2v/virt-v2v.pod:1151
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1093
+#: ../v2v/virt-v2v.pod:1155
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -91923,7 +92052,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1097
+#: ../v2v/virt-v2v.pod:1159
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -91956,7 +92085,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1126
+#: ../v2v/virt-v2v.pod:1188
msgid ""
"The I<--machine-readable> option can be used to make the output more machine "
"friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -91964,14 +92093,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1194
msgid ""
"Firstly use the option on its own to query the capabilities of the virt-v2v "
"binary. Typical output looks like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1135
+#: ../v2v/virt-v2v.pod:1197
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -91987,7 +92116,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1148
+#: ../v2v/virt-v2v.pod:1210
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -91995,7 +92124,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1174
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"The calling program should treat messages sent to stderr as error messages. "
"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -92003,70 +92132,65 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1180
+#: ../v2v/virt-v2v.pod:1242
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1187
+#: ../v2v/virt-v2v.pod:1249
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1189 ../v2v/virt-v2v.pod:1243
+#: ../v2v/virt-v2v.pod:1251 ../v2v/virt-v2v.pod:1293
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1191
+#: ../v2v/virt-v2v.pod:1253
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1201
+#: ../v2v/virt-v2v.pod:1263
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1212
-msgid ""
-"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
-"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
-"physical RAM. If virt-v2v exceeds this, it will hang. The solution is "
-"either to use a real disk, or to increase the maximum size of the tmpfs "
-"mountpoint, eg:"
+#: ../v2v/virt-v2v.pod:1268
+msgid "See the L</Disk space> section above."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1222
+#: ../v2v/virt-v2v.pod:1272
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1234
+#: ../v2v/virt-v2v.pod:1284
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1236
+#: ../v2v/virt-v2v.pod:1286
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1241
+#: ../v2v/virt-v2v.pod:1291
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1245
+#: ../v2v/virt-v2v.pod:1295
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -92076,14 +92200,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1251
+#: ../v2v/virt-v2v.pod:1301
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1262
+#: ../v2v/virt-v2v.pod:1312
msgid ""
"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
@@ -92091,17 +92215,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1280
+#: ../v2v/virt-v2v.pod:1330
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1282
+#: ../v2v/virt-v2v.pod:1332
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1284
+#: ../v2v/virt-v2v.pod:1334
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 2390973..38d2000 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.63\n"
+"Project-Id-Version: libguestfs 1.27.64\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-15 22:18+0300\n"
+"POT-Creation-Date: 2014-10-17 17:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -789,7 +789,7 @@ msgid "successful exit, all partitions are aligned E<ge> 64K for best performanc
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286 ../v2v/virt-v2v.pod:985
+#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286 ../v2v/virt-v2v.pod:1047
msgid "1"
msgstr ""
@@ -799,7 +799,7 @@ msgid "an error scanning the disk image or guest"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290 ../v2v/virt-v2v.pod:989
+#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290 ../v2v/virt-v2v.pod:1051
msgid "2"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:92 ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:1197
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:92 ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:1259
msgid "ENVIRONMENT VARIABLES"
msgstr ""
@@ -1148,7 +1148,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1272 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1272 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3482 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3482 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816 ../test-tool/libguestfs-test-tool.pod [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:489 ../examples/guestfs-faq.pod:716 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:489 ../examples/guestfs-faq.pod:716 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101 ../src/guestfs. [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:726 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:726 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105 ../src/guestfs. [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:500 ../examples/guestfs-faq.pod:731 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:912 ../v2v/virt-v2v.pod:1172
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:500 ../examples/guestfs-faq.pod:731 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:912 ../v2v/virt-v2v.pod:1234
msgid "3."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1124
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1186
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -4539,7 +4539,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1145
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1207
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -4587,7 +4587,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1220
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1270
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -4599,19 +4599,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1225
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1275
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1228
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1278
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1232
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1282
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -4624,7 +4624,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1239
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1289
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7348,7 +7348,7 @@ msgid "This program returns 0 on success, or 1 if there was an error."
msgstr ""
#. type: textblock
-#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1258
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1308
msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -7474,7 +7474,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72 ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:1183
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72 ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:1245
msgid "FILES"
msgstr ""
@@ -49451,7 +49451,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1278
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1328
msgid "Matthew Booth"
msgstr ""
@@ -51355,7 +51355,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:1130
+#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:1192
msgid "There are two ways to use this option."
msgstr ""
@@ -51380,26 +51380,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:1152
+#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:1214
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:1155
+#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:1217
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:1161
+#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:1223
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
msgstr ""
#. type: verbatim
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:1164
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:1226
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -51407,7 +51407,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:1168
+#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:1230
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -52223,7 +52223,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1203
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1265
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -52237,7 +52237,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1206
+#: ../sparsify/virt-sparsify.pod:407
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -52245,7 +52245,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1210
+#: ../sparsify/virt-sparsify.pod:411
msgid "This defaults to C</tmp>."
msgstr ""
@@ -52260,7 +52260,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1218
+#: ../sparsify/virt-sparsify.pod:419
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -82496,17 +82496,140 @@ msgstr ""
#. type: =head1
#: ../v2v/virt-v2v.pod:969
-msgid "POST-CONVERSION TASKS"
+msgid "RESOURCE REQUIREMENTS"
msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:971
-msgid "Guest network configuration"
+msgid "Network"
msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:973
msgid ""
+"The most important resource for virt-v2v appears to be network bandwidth. "
+"Virt-v2v should be able to copy guest data at gigabit ethernet speeds or "
+"greater."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:977
+msgid ""
+"Ensure that the network connections between servers (conversion server, NFS "
+"server, vCenter, Xen) are as fast and as low latency as possible."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:981
+msgid "Disk space"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:983
+msgid ""
+"Virt-v2v places potentially large temporary files in C<$TMPDIR> (which is "
+"C</var/tmp> if you don't set it). Using tmpfs is a bad idea."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:986
+msgid ""
+"For each guest disk, an overlay is stored temporarily. This stores the "
+"changes made during conversion, and is used as a cache. The overlays are "
+"not particularly large - tens or low hundreds of megabytes per disk is "
+"typical. In addition to the overlay(s), input and output methods may use "
+"disk space, as outlined in the table below."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:994
+msgid "I<-i ova>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:996
+msgid ""
+"This temporarily places a full copy of the uncompressed source disks in "
+"C<$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:999
+msgid "I<-o glance>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1001 ../v2v/virt-v2v.pod:1012
+msgid "This temporarily places a full copy of the output disks in C<$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1003
+msgid "I<-o local>"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1005
+msgid "I<-o qemu>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1007
+msgid ""
+"You must ensure there is sufficient space in the output directory for the "
+"converted guest."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1010
+msgid "I<-o null>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1016
+msgid "VMware vCenter resources"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1018
+msgid ""
+"Copying from VMware vCenter is currently quite slow, but we believe this to "
+"be an issue with VMware. Ensuring the VMware ESXi hypervisor and vCenter "
+"guest are running on fast hardware with plenty of memory should alleviate "
+"this."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1023
+msgid "Compute power and RAM"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1025
+msgid ""
+"Virt-v2v is not especially compute or RAM intensive. If you are running "
+"many parallel conversions, then you may consider allocating one CPU core and "
+"512 MB - 1 GB of RAM per running instance."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1029
+msgid "Virt-v2v can be run in a virtual machine."
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:1031
+msgid "POST-CONVERSION TASKS"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1033
+msgid "Guest network configuration"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1035
+msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
"network configuration may have to be updated. See also "
@@ -82514,29 +82637,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:978
+#: ../v2v/virt-v2v.pod:1040
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:980
+#: ../v2v/virt-v2v.pod:1042
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:1049
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:991
+#: ../v2v/virt-v2v.pod:1053
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:995
+#: ../v2v/virt-v2v.pod:1057
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -82544,7 +82667,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:999
+#: ../v2v/virt-v2v.pod:1061
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -82552,12 +82675,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:1003
+#: ../v2v/virt-v2v.pod:1065
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1005
+#: ../v2v/virt-v2v.pod:1067
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -82565,7 +82688,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1072
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -82577,12 +82700,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1018
+#: ../v2v/virt-v2v.pod:1080
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1020
+#: ../v2v/virt-v2v.pod:1082
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -82590,19 +82713,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1026
+#: ../v2v/virt-v2v.pod:1088
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1090
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1031
+#: ../v2v/virt-v2v.pod:1093
msgid ""
"You can avoid needing root here by mounting it yourself before running "
"virt-v2v, and passing I<-os /mountpoint> instead, but first of all read the "
@@ -82610,12 +82733,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1035
+#: ../v2v/virt-v2v.pod:1097
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1099
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the "
@@ -82623,7 +82746,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1041
+#: ../v2v/virt-v2v.pod:1103
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as "
@@ -82632,12 +82755,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1046
+#: ../v2v/virt-v2v.pod:1108
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1048
+#: ../v2v/virt-v2v.pod:1110
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -82645,7 +82768,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1115
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -82653,12 +82776,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1120
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1060
+#: ../v2v/virt-v2v.pod:1122
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -82666,12 +82789,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1067
+#: ../v2v/virt-v2v.pod:1129
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1069
+#: ../v2v/virt-v2v.pod:1131
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -82680,14 +82803,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1074
+#: ../v2v/virt-v2v.pod:1136
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1078
+#: ../v2v/virt-v2v.pod:1140
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -82699,19 +82822,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1087
+#: ../v2v/virt-v2v.pod:1149
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1089
+#: ../v2v/virt-v2v.pod:1151
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1093
+#: ../v2v/virt-v2v.pod:1155
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -82719,7 +82842,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1097
+#: ../v2v/virt-v2v.pod:1159
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -82752,7 +82875,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1126
+#: ../v2v/virt-v2v.pod:1188
msgid ""
"The I<--machine-readable> option can be used to make the output more machine "
"friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -82760,14 +82883,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1194
msgid ""
"Firstly use the option on its own to query the capabilities of the virt-v2v "
"binary. Typical output looks like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1135
+#: ../v2v/virt-v2v.pod:1197
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -82783,7 +82906,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1148
+#: ../v2v/virt-v2v.pod:1210
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -82791,7 +82914,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1174
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"The calling program should treat messages sent to stderr as error messages. "
"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -82799,70 +82922,65 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1180
+#: ../v2v/virt-v2v.pod:1242
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1187
+#: ../v2v/virt-v2v.pod:1249
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1189 ../v2v/virt-v2v.pod:1243
+#: ../v2v/virt-v2v.pod:1251 ../v2v/virt-v2v.pod:1293
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1191
+#: ../v2v/virt-v2v.pod:1253
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1201
+#: ../v2v/virt-v2v.pod:1263
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1212
-msgid ""
-"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
-"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
-"physical RAM. If virt-v2v exceeds this, it will hang. The solution is "
-"either to use a real disk, or to increase the maximum size of the tmpfs "
-"mountpoint, eg:"
+#: ../v2v/virt-v2v.pod:1268
+msgid "See the L</Disk space> section above."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1222
+#: ../v2v/virt-v2v.pod:1272
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1234
+#: ../v2v/virt-v2v.pod:1284
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1236
+#: ../v2v/virt-v2v.pod:1286
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1241
+#: ../v2v/virt-v2v.pod:1291
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1245
+#: ../v2v/virt-v2v.pod:1295
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -82872,14 +82990,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1251
+#: ../v2v/virt-v2v.pod:1301
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1262
+#: ../v2v/virt-v2v.pod:1312
msgid ""
"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
@@ -82887,16 +83005,16 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1280
+#: ../v2v/virt-v2v.pod:1330
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1282
+#: ../v2v/virt-v2v.pod:1332
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1284
+#: ../v2v/virt-v2v.pod:1334
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index f3fc829..565ff69 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-10-15 22:18+0300\n"
+"POT-Creation-Date: 2014-10-17 17:36+0200\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -1397,7 +1397,7 @@ msgstr ""
#. type: =item
#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286
-#: ../v2v/virt-v2v.pod:985
+#: ../v2v/virt-v2v.pod:1047
msgid "1"
msgstr "1"
@@ -1408,7 +1408,7 @@ msgstr "під час сканування образу диска або гос
#. type: =item
#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290
-#: ../v2v/virt-v2v.pod:989
+#: ../v2v/virt-v2v.pod:1051
msgid "2"
msgstr "2"
@@ -1458,7 +1458,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4750
#: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1260
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1310
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1498,7 +1498,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1276
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1326
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1529,7 +1529,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4814
#: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1286
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1336
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1846,7 +1846,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642
#: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:1197
+#: ../v2v/virt-v2v.pod:1259
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1885,7 +1885,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4810
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1274
+#: ../v2v/virt-v2v.pod:1324
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1916,7 +1916,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1288
+#: ../v2v/virt-v2v.pod:1338
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2908,7 +2908,7 @@ msgstr ""
#: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
#: ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101
#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:890
-#: ../v2v/virt-v2v.pod:1159
+#: ../v2v/virt-v2v.pod:1221
msgid "1."
msgstr "1."
@@ -2928,7 +2928,7 @@ msgstr ""
#: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
#: ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105
#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:904
-#: ../v2v/virt-v2v.pod:1166
+#: ../v2v/virt-v2v.pod:1228
msgid "2."
msgstr "2."
@@ -2947,7 +2947,7 @@ msgstr ""
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
#: ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:912
-#: ../v2v/virt-v2v.pod:1172
+#: ../v2v/virt-v2v.pod:1234
msgid "3."
msgstr "3."
@@ -5515,7 +5515,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1124
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1186
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5550,7 +5550,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1145
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1207
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5599,7 +5599,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1220
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1270
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5613,7 +5613,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1225
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1275
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5621,13 +5621,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1228
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1278
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1232
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1282
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5642,7 +5642,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1239
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1289
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8715,7 +8715,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1258
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1308
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8851,7 +8851,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72
#: ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:1183
+#: ../v2v/virt-v2v.pod:1245
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -52923,7 +52923,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1278
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1328
msgid "Matthew Booth"
msgstr ""
@@ -54933,7 +54933,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:1130
+#: ../v2v/virt-v2v.pod:1192
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -54966,7 +54966,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:1152
+#: ../v2v/virt-v2v.pod:1214
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -54974,13 +54974,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:1155
+#: ../v2v/virt-v2v.pod:1217
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:1161
+#: ../v2v/virt-v2v.pod:1223
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -54988,7 +54988,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:1164
+#: ../v2v/virt-v2v.pod:1226
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -54999,7 +54999,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:1168
+#: ../v2v/virt-v2v.pod:1230
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -55859,7 +55859,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1203
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1265
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -55873,7 +55873,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1206
+#: ../sparsify/virt-sparsify.pod:407
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -55881,7 +55881,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1210
+#: ../sparsify/virt-sparsify.pod:411
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -55896,7 +55896,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1218
+#: ../sparsify/virt-sparsify.pod:419
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -90740,16 +90740,147 @@ msgstr ""
#. type: =head1
#: ../v2v/virt-v2v.pod:969
-msgid "POST-CONVERSION TASKS"
+msgid "RESOURCE REQUIREMENTS"
msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:971
+#, fuzzy
+#| msgid "network"
+msgid "Network"
+msgstr "network"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:973
+msgid ""
+"The most important resource for virt-v2v appears to be network bandwidth. "
+"Virt-v2v should be able to copy guest data at gigabit ethernet speeds or "
+"greater."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:977
+msgid ""
+"Ensure that the network connections between servers (conversion server, NFS "
+"server, vCenter, Xen) are as fast and as low latency as possible."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:981
+msgid "Disk space"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:983
+msgid ""
+"Virt-v2v places potentially large temporary files in C<$TMPDIR> (which is C</"
+"var/tmp> if you don't set it). Using tmpfs is a bad idea."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:986
+msgid ""
+"For each guest disk, an overlay is stored temporarily. This stores the "
+"changes made during conversion, and is used as a cache. The overlays are "
+"not particularly large - tens or low hundreds of megabytes per disk is "
+"typical. In addition to the overlay(s), input and output methods may use "
+"disk space, as outlined in the table below."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:994
+msgid "I<-i ova>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:996
+msgid ""
+"This temporarily places a full copy of the uncompressed source disks in C<"
+"$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:999
+#, fuzzy
+#| msgid "B<-o kernel_cache>"
+msgid "I<-o glance>"
+msgstr "B<-o kernel_cache>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1001 ../v2v/virt-v2v.pod:1012
+msgid "This temporarily places a full copy of the output disks in C<$TMPDIR>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1003
+msgid "I<-o local>"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1005
+#, fuzzy
+#| msgid "I<vs. qemu-nbd>"
+msgid "I<-o qemu>"
+msgstr "I<порівняно з qemu-nbd>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1007
+msgid ""
+"You must ensure there is sufficient space in the output directory for the "
+"converted guest."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:1010
+msgid "I<-o null>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1016
+msgid "VMware vCenter resources"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1018
+msgid ""
+"Copying from VMware vCenter is currently quite slow, but we believe this to "
+"be an issue with VMware. Ensuring the VMware ESXi hypervisor and vCenter "
+"guest are running on fast hardware with plenty of memory should alleviate "
+"this."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1023
+msgid "Compute power and RAM"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1025
+msgid ""
+"Virt-v2v is not especially compute or RAM intensive. If you are running "
+"many parallel conversions, then you may consider allocating one CPU core and "
+"512 MB - 1 GB of RAM per running instance."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:1029
+#, fuzzy
+#| msgid "virt-ls - List files in a virtual machine"
+msgid "Virt-v2v can be run in a virtual machine."
+msgstr "virt-ls — програма для показу списку файлів у віртуальній машині"
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:1031
+msgid "POST-CONVERSION TASKS"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:1033
msgid "Guest network configuration"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:1035
msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
@@ -90757,29 +90888,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:978
+#: ../v2v/virt-v2v.pod:1040
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:980
+#: ../v2v/virt-v2v.pod:1042
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:1049
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:991
+#: ../v2v/virt-v2v.pod:1053
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:995
+#: ../v2v/virt-v2v.pod:1057
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -90787,7 +90918,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:999
+#: ../v2v/virt-v2v.pod:1061
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -90795,12 +90926,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:1003
+#: ../v2v/virt-v2v.pod:1065
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1005
+#: ../v2v/virt-v2v.pod:1067
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -90808,7 +90939,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1072
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -90820,12 +90951,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1018
+#: ../v2v/virt-v2v.pod:1080
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1020
+#: ../v2v/virt-v2v.pod:1082
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -90833,19 +90964,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1026
+#: ../v2v/virt-v2v.pod:1088
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1028
+#: ../v2v/virt-v2v.pod:1090
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1031
+#: ../v2v/virt-v2v.pod:1093
msgid ""
"You can avoid needing root here by mounting it yourself before running virt-"
"v2v, and passing I<-os /mountpoint> instead, but first of all read the next "
@@ -90853,12 +90984,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1035
+#: ../v2v/virt-v2v.pod:1097
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1099
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the UID:"
@@ -90866,7 +90997,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1041
+#: ../v2v/virt-v2v.pod:1103
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as non-"
@@ -90875,12 +91006,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1046
+#: ../v2v/virt-v2v.pod:1108
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1048
+#: ../v2v/virt-v2v.pod:1110
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -90888,7 +91019,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1115
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -90896,12 +91027,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1120
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1060
+#: ../v2v/virt-v2v.pod:1122
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -90909,12 +91040,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1067
+#: ../v2v/virt-v2v.pod:1129
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1069
+#: ../v2v/virt-v2v.pod:1131
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -90923,14 +91054,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1074
+#: ../v2v/virt-v2v.pod:1136
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1078
+#: ../v2v/virt-v2v.pod:1140
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -90942,19 +91073,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1087
+#: ../v2v/virt-v2v.pod:1149
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1089
+#: ../v2v/virt-v2v.pod:1151
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1093
+#: ../v2v/virt-v2v.pod:1155
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -90962,7 +91093,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1097
+#: ../v2v/virt-v2v.pod:1159
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -90995,7 +91126,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1126
+#: ../v2v/virt-v2v.pod:1188
msgid ""
"The I<--machine-readable> option can be used to make the output more machine "
"friendly, which is useful when calling virt-v2v from other programs, GUIs "
@@ -91003,14 +91134,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1194
msgid ""
"Firstly use the option on its own to query the capabilities of the virt-v2v "
"binary. Typical output looks like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1135
+#: ../v2v/virt-v2v.pod:1197
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -91026,7 +91157,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1148
+#: ../v2v/virt-v2v.pod:1210
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -91034,7 +91165,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1174
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"The calling program should treat messages sent to stderr as error messages. "
"In addition, virt-v2v exits with a non-zero status code if there was a fatal "
@@ -91042,70 +91173,65 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1180
+#: ../v2v/virt-v2v.pod:1242
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1187
+#: ../v2v/virt-v2v.pod:1249
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1189 ../v2v/virt-v2v.pod:1243
+#: ../v2v/virt-v2v.pod:1251 ../v2v/virt-v2v.pod:1293
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1191
+#: ../v2v/virt-v2v.pod:1253
msgid ""
"If this directory is present, then virtio drivers for Windows guests will be "
"found from this directory and installed in the guest during conversion."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1201
+#: ../v2v/virt-v2v.pod:1263
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1212
-msgid ""
-"Note that if C<$TMPDIR> is a tmpfs (eg. if C</tmp> is on tmpfs, or if you "
-"use C<TMPDIR=/dev/shm>), tmpfs defaults to a maximum size of I<half> of "
-"physical RAM. If virt-v2v exceeds this, it will hang. The solution is "
-"either to use a real disk, or to increase the maximum size of the tmpfs "
-"mountpoint, eg:"
+#: ../v2v/virt-v2v.pod:1268
+msgid "See the L</Disk space> section above."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1222
+#: ../v2v/virt-v2v.pod:1272
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1234
+#: ../v2v/virt-v2v.pod:1284
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1236
+#: ../v2v/virt-v2v.pod:1286
msgid ""
"This is the RHSrvAny Windows binary, used to install a \"firstboot\" script "
"in the guest during conversion of Windows guests."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1241
+#: ../v2v/virt-v2v.pod:1291
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1245
+#: ../v2v/virt-v2v.pod:1295
msgid ""
"The RHEV Application Provisioning Tool (RHEV APT). If this file is present, "
"then RHEV APT will be installed in the Windows guest during conversion. "
@@ -91115,14 +91241,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1251
+#: ../v2v/virt-v2v.pod:1301
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1262
+#: ../v2v/virt-v2v.pod:1312
msgid ""
"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
@@ -91130,17 +91256,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1280
+#: ../v2v/virt-v2v.pod:1330
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1282
+#: ../v2v/virt-v2v.pod:1332
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1284
+#: ../v2v/virt-v2v.pod:1334
msgid "Tingting Zheng"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 5407836..e1962fe 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/es.po b/po/es.po
index c337567..23f62e6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -826,7 +826,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -836,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -852,11 +852,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -876,7 +876,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -900,11 +900,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1046,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1098,7 +1098,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1106,7 +1106,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1194,7 +1194,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1293,7 +1293,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1361,7 +1361,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1420,11 +1420,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1456,7 +1456,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1487,11 +1487,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1944,7 +1944,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2098,11 +2098,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2298,11 +2298,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2316,7 +2318,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2326,11 +2328,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2387,7 +2389,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2439,12 +2441,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2485,7 +2487,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2615,11 +2617,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2635,7 +2637,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2655,7 +2657,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2669,6 +2671,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2700,11 +2706,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2714,7 +2720,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2764,7 +2770,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2807,7 +2813,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2819,7 +2825,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2913,7 +2919,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3134,7 +3140,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 5192631..b666656 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -835,7 +835,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -851,11 +851,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -875,7 +875,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -899,11 +899,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1097,7 +1097,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1105,7 +1105,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1292,7 +1292,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1360,7 +1360,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,11 +1419,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1455,7 +1455,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1486,11 +1486,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1943,7 +1943,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2097,11 +2097,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2297,11 +2297,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2315,7 +2317,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2325,11 +2327,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2386,7 +2388,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2438,12 +2440,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2484,7 +2486,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2614,11 +2616,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2634,7 +2636,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2654,7 +2656,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2668,6 +2670,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2699,11 +2705,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2713,7 +2719,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2763,7 +2769,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2806,7 +2812,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2818,7 +2824,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2912,7 +2918,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3133,7 +3139,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index ef1ef6b..ff5b4ea 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -835,7 +835,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -851,11 +851,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -875,7 +875,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -899,11 +899,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1097,7 +1097,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1105,7 +1105,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1292,7 +1292,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1360,7 +1360,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,11 +1419,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1455,7 +1455,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1486,11 +1486,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1943,7 +1943,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2097,11 +2097,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2297,11 +2297,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2315,7 +2317,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2325,11 +2327,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2386,7 +2388,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2438,12 +2440,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2484,7 +2486,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2614,11 +2616,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2634,7 +2636,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2654,7 +2656,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2668,6 +2670,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2699,11 +2705,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2713,7 +2719,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2763,7 +2769,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2806,7 +2812,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2818,7 +2824,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2912,7 +2918,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3133,7 +3139,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index ab1760e..9f4bb3e 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 80f4a6d..7122f71 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.63\n"
+"Project-Id-Version: libguestfs 1.27.64\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -823,7 +823,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -833,7 +833,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -849,11 +849,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -873,7 +873,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -897,11 +897,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1043,7 +1043,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1095,7 +1095,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1103,7 +1103,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1191,7 +1191,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1276,7 +1276,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1290,7 +1290,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1358,7 +1358,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,11 +1417,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1453,7 +1453,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1484,11 +1484,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1941,7 +1941,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2095,11 +2095,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2265,7 +2265,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2295,11 +2295,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2313,7 +2315,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2323,11 +2325,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2384,7 +2386,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2436,12 +2438,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2482,7 +2484,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2612,11 +2614,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2632,7 +2634,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2652,7 +2654,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2666,6 +2668,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2697,11 +2703,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2711,7 +2717,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2761,7 +2767,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2804,7 +2810,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2816,7 +2822,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2910,7 +2916,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3131,7 +3137,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 3e6c223..55cbda4 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 689c1a1..86be789 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -835,7 +835,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -851,11 +851,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -875,7 +875,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -899,11 +899,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1097,7 +1097,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1105,7 +1105,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1292,7 +1292,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1360,7 +1360,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,11 +1419,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1455,7 +1455,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1486,11 +1486,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1943,7 +1943,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2097,11 +2097,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2297,11 +2297,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2315,7 +2317,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2325,11 +2327,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2386,7 +2388,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2438,12 +2440,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2484,7 +2486,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2614,11 +2616,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2634,7 +2636,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2654,7 +2656,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2668,6 +2670,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2699,11 +2705,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2713,7 +2719,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2763,7 +2769,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2806,7 +2812,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2818,7 +2824,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2912,7 +2918,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3133,7 +3139,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index fec0299..06e9946 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -826,7 +826,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -836,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -852,11 +852,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -876,7 +876,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -900,11 +900,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1046,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1098,7 +1098,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1106,7 +1106,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1194,7 +1194,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1293,7 +1293,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1361,7 +1361,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1420,11 +1420,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1456,7 +1456,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1487,11 +1487,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1944,7 +1944,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2098,11 +2098,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2298,11 +2298,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2316,7 +2318,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2326,11 +2328,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2387,7 +2389,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2439,12 +2441,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2485,7 +2487,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2615,11 +2617,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2635,7 +2637,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2655,7 +2657,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2669,6 +2671,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2700,11 +2706,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2714,7 +2720,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2764,7 +2770,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2807,7 +2813,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2819,7 +2825,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2913,7 +2919,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3134,7 +3140,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/or.po b/po/or.po
index c5f4058..9d76685 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 6772218..ea3b519 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -835,7 +835,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -851,11 +851,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -875,7 +875,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -899,11 +899,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1045,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1097,7 +1097,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1105,7 +1105,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1193,7 +1193,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1292,7 +1292,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1360,7 +1360,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,11 +1419,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1455,7 +1455,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1486,11 +1486,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1943,7 +1943,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2097,11 +2097,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2297,11 +2297,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2315,7 +2317,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2325,11 +2327,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2386,7 +2388,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2438,12 +2440,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2484,7 +2486,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2614,11 +2616,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2634,7 +2636,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2654,7 +2656,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2668,6 +2670,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2699,11 +2705,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2713,7 +2719,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2763,7 +2769,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2806,7 +2812,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2818,7 +2824,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2912,7 +2918,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3133,7 +3139,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index efbbc0b..4326efd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -828,7 +828,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -838,7 +838,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -854,11 +854,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -878,7 +878,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -902,11 +902,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1048,7 +1048,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1100,7 +1100,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1108,7 +1108,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1196,7 +1196,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1281,7 +1281,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1295,7 +1295,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1363,7 +1363,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1422,11 +1422,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1458,7 +1458,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1489,11 +1489,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1946,7 +1946,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2100,11 +2100,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2270,7 +2270,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2300,11 +2300,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2318,7 +2320,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2328,11 +2330,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2389,7 +2391,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2441,12 +2443,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2487,7 +2489,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2617,11 +2619,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2637,7 +2639,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2657,7 +2659,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2671,6 +2673,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2702,11 +2708,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2716,7 +2722,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2766,7 +2772,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2809,7 +2815,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2821,7 +2827,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2915,7 +2921,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3136,7 +3142,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 06dbf0c..94473fb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 24ada51..2c73f1b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -824,7 +824,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -834,7 +834,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -850,11 +850,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -874,7 +874,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -898,11 +898,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1096,7 +1096,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1104,7 +1104,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1192,7 +1192,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1277,7 +1277,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1291,7 +1291,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1359,7 +1359,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,11 +1418,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1454,7 +1454,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1485,11 +1485,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2096,11 +2096,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2296,11 +2296,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2314,7 +2316,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2324,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2385,7 +2387,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2437,12 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2483,7 +2485,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2613,11 +2615,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2633,7 +2635,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
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 "
@@ -2653,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2667,6 +2669,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2698,11 +2704,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2712,7 +2718,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2762,7 +2768,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2805,7 +2811,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2817,7 +2823,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2917,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3132,7 +3138,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 00bb4ce..59d25b5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-15 22:17+0200\n"
+"POT-Creation-Date: 2014-10-17 17:35+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
+#: ../v2v/v2v.ml:600 ../v2v/v2v.ml:489
msgid "%s (ignored)"
msgstr ""
@@ -826,7 +826,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:222
+#: ../v2v/v2v.ml:227
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -836,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:275
msgid "Closing the overlay"
msgstr ""
@@ -852,11 +852,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:237
+#: ../v2v/v2v.ml:242
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:235
+#: ../v2v/v2v.ml:240
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -876,7 +876,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:296
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -900,11 +900,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:114
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:386
+#: ../v2v/v2v.ml:391
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1046,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:420
+#: ../v2v/v2v.ml:425
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1098,7 +1098,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:433
+#: ../v2v/v2v.ml:438
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
@@ -1106,7 +1106,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/v2v.ml:226
+#: ../v2v/v2v.ml:231
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1194,7 +1194,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:400 ../customize/customize_main.ml:256
+#: ../v2v/v2v.ml:405 ../customize/customize_main.ml:256
#: ../builder/builder.ml:715
msgid "Finishing off"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:167
+#: ../v2v/v2v.ml:172
msgid "Initializing the target %s"
msgstr ""
@@ -1293,7 +1293,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:206
msgid "Inspecting the overlay"
msgstr ""
@@ -1361,7 +1361,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:266
+#: ../v2v/v2v.ml:271
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1420,11 +1420,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:142
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/v2v.ml:56
+#: ../v2v/v2v.ml:61
msgid "Opening the source %s"
msgstr ""
@@ -1456,7 +1456,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:396
+#: ../v2v/v2v.ml:401
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1487,11 +1487,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:460
+#: ../v2v/v2v.ml:465
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:456
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1944,7 +1944,7 @@ msgstr ""
msgid "Source URI: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:61
+#: ../v2v/v2v.ml:66
msgid "Source guest information (--print-source option):\n"
msgstr ""
@@ -2098,11 +2098,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:256
+#: ../v2v/v2v.ml:261
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:259
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "cannot detect the input disk format; use the -if parameter"
msgstr ""
-#: ../v2v/input_ova.ml:75
+#: ../v2v/input_ova.ml:80
msgid "cannot parse output of sha1sum command"
msgstr ""
@@ -2298,11 +2298,13 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/input_ova.ml:73
-msgid "checksum of %s does not match manifest sha1 %s"
+#: ../v2v/input_ova.ml:75
+msgid ""
+"checksum of disk %s does not match manifest %s (actual sha1(%s) = %s, "
+"expected sha1 (%s) = %s)"
msgstr ""
-#: ../v2v/v2v.ml:440
+#: ../v2v/v2v.ml:445
msgid "connection closed"
msgstr ""
@@ -2316,7 +2318,7 @@ msgid ""
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:411
+#: ../v2v/convert_windows.ml:415
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
@@ -2326,11 +2328,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:164
+#: ../v2v/input_ova.ml:173
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:116
+#: ../v2v/input_ova.ml:125
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2387,7 +2389,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:177
+#: ../v2v/v2v.ml:182
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2439,12 +2441,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:154
+#: ../v2v/input_ova.ml:163
msgid "error parsing disk fileRef"
msgstr ""
#: ../v2v/input_ova.ml:43
-msgid "error unpacking OVA file: %s"
+msgid "error unpacking %s, see earlier error messages"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2485,7 +2487,7 @@ msgstr ""
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:116 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2615,11 +2617,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:303
+#: ../v2v/v2v.ml:308
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:136
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2635,7 +2637,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:467
+#: ../v2v/v2v.ml:472
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2655,7 +2657,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:447
+#: ../v2v/v2v.ml:452
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2669,6 +2671,10 @@ msgstr ""
msgid "never|always|auto"
msgstr ""
+#: ../v2v/input_ova.ml:54
+msgid "no .ovf file was found in %s"
+msgstr ""
+
#: ../builder/builder.ml:205
msgid "no cache directory\n"
msgstr ""
@@ -2700,11 +2706,11 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:69
+#: ../v2v/input_ova.ml:71
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:413
+#: ../v2v/v2v.ml:418
msgid "no root device found in this operating system image."
msgstr ""
@@ -2714,7 +2720,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:541
+#: ../v2v/v2v.ml:546
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2764,7 +2770,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2807,7 +2813,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:337 ../v2v/v2v.ml:127
+#: ../v2v/v2v.ml:342 ../v2v/v2v.ml:132
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2819,7 +2825,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:463
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2913,7 +2919,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:479
+#: ../v2v/v2v.ml:484
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3134,7 +3140,7 @@ msgid ""
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:246
+#: ../v2v/v2v.ml:251
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list