[Pkg-libvirt-commits] [libguestfs] 202/266: Version 1.27.32.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:42:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.
commit 620d20c4bb314e6543a4901880845d01ee7d2ef9
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Aug 28 22:00:33 2014 +0100
Version 1.27.32.
---
AUTHORS | 1 +
BUGS | 19 +-
configure.ac | 2 +-
po-docs/ja.po | 738 ++++++++++++++++++++++++++++---------------
po-docs/libguestfs-docs.pot | 725 +++++++++++++++++++++++++++---------------
po-docs/uk.po | 743 +++++++++++++++++++++++++++++---------------
po/en_GB.po | 208 ++++++++-----
po/es.po | 208 ++++++++-----
po/gu.po | 208 ++++++++-----
po/hi.po | 208 ++++++++-----
po/kn.po | 208 ++++++++-----
po/libguestfs.pot | 210 ++++++++-----
po/ml.po | 208 ++++++++-----
po/mr.po | 208 ++++++++-----
po/nl.po | 208 ++++++++-----
po/or.po | 208 ++++++++-----
po/pa.po | 208 ++++++++-----
po/pl.po | 208 ++++++++-----
po/ta.po | 208 ++++++++-----
po/te.po | 208 ++++++++-----
po/uk.po | 208 ++++++++-----
21 files changed, 3371 insertions(+), 1979 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 1e9a590..50b7ef3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,6 +46,7 @@ Qin Guan
Rajesh Ranjan
Richard W.M. Jones
Sandeep Shedmake
+Shahar Havivi
Shankar Prasad
Thomas S Hatch
Török Edwin
diff --git a/BUGS b/BUGS
index 507278b..796ea0e 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-24
+Last updated: 2014-08-28
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -23,9 +23,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
507278 NEW https://bugzilla.redhat.com/show_bug.cgi?id=507278
libguestfs fails to build on Fedora sparc64
-547488 NEW https://bugzilla.redhat.com/show_bug.cgi?id=547488
- guestfish cannot tab complete filenames that contain spaces
-
554829 NEW https://bugzilla.redhat.com/show_bug.cgi?id=554829
SELinux handling could be done better.
@@ -332,9 +329,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1123221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123221
make xfs faield, "mkfs.xfs: No such file or directory"
-1123281 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123281
- lvm-set-filter stopped working in Rawhide
-
1123797 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123797
libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
@@ -350,6 +344,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1132652 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1132652
virt-sysprep firstboot doesn't work with RHEL 7 guest
+1134726 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1134726
+ [RFE] virt-builder should support args with the --run command
+
+1135064 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1135064
+ virt-sparsify fails at /sys/block/sdb/dev discovery
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -359,6 +359,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
541618 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=541618
guestfish not able to mount freebsd ufs2 partitions automatically
+547488 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=547488
+ guestfish cannot tab complete filenames that contain spaces
+
619334 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=619334
RFE: Enable coredump capture in the appliance
@@ -368,7 +371,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1069966 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1069966
RFE: let virt-builder etc build ARM guests on x86 host
-(116 bugs)
+(117 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
diff --git a/configure.ac b/configure.ac
index e643ae5..cc844cf 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], [31])
+m4_define([libguestfs_release], [32])
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 9fb3cc7..2653c8d 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-08-21 17:07+0200\n"
+"POT-Creation-Date: 2014-08-28 21:59+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -395,7 +395,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:116
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:120
msgid "OPTIONS"
msgstr "オプション"
@@ -414,7 +414,7 @@ msgstr "オプション"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:120
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:124
msgid "B<--help>"
msgstr "B<--help>"
@@ -718,7 +718,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:310
msgid "B<-q>"
msgstr "B<-q>"
@@ -726,7 +726,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:312
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -776,7 +776,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:391
+#: ../v2v/virt-v2v.pod:397
msgid "B<-v>"
msgstr "B<-v>"
@@ -791,7 +791,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:393
+#: ../v2v/virt-v2v.pod:399
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -803,7 +803,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:401
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -821,7 +821,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:403
msgid "B<-V>"
msgstr "B<-V>"
@@ -840,7 +840,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:399
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:405
msgid "B<--version>"
msgstr "B<--version>"
@@ -855,7 +855,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:401
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:407
msgid "Display version number and exit."
msgstr "バージョン番号を表示して、終了します。"
@@ -870,7 +870,7 @@ msgstr "バージョン番号を表示して、終了します。"
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:412
+#: ../v2v/virt-v2v.pod:418
msgid "B<-x>"
msgstr "B<-x>"
@@ -883,7 +883,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:414
+#: ../v2v/virt-v2v.pod:420
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1406,9 +1406,9 @@ msgstr "このプログラムは以下を返します:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:320 ../v2v/virt-v2v.pod:324
-#: ../v2v/virt-v2v.pod:328 ../v2v/virt-v2v.pod:540 ../v2v/virt-v2v.pod:545
-#: ../v2v/virt-v2v.pod:550
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:326 ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:334 ../v2v/virt-v2v.pod:616 ../v2v/virt-v2v.pod:621
+#: ../v2v/virt-v2v.pod:626
msgid "*"
msgstr "*"
@@ -1489,7 +1489,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../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:738
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:851
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1529,7 +1529,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:753
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:866
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:4816
#: ../sysprep/virt-sysprep.pod:571 ../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:759
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:872
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1888,7 +1888,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:675
+#: ../v2v/virt-v2v.pod:788
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1926,7 +1926,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:751
+#: ../v2v/virt-v2v.pod:864
msgid "AUTHORS"
msgstr "著者"
@@ -1956,7 +1956,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:761
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:874
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2405,7 +2405,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:126
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -2788,13 +2788,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:184
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:186
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2893,7 +2893,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:561 ../v2v/virt-v2v.pod:637
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:637 ../v2v/virt-v2v.pod:750
msgid "1."
msgstr "1."
@@ -2913,7 +2913,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:575 ../v2v/virt-v2v.pod:644
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:651 ../v2v/virt-v2v.pod:757
msgid "2."
msgstr "2."
@@ -2931,8 +2931,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583
-#: ../v2v/virt-v2v.pod:650
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:763
msgid "3."
msgstr "3."
@@ -2947,7 +2947,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:680
msgid "4."
msgstr "4."
@@ -5362,7 +5362,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:725
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5397,7 +5397,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:740
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5446,7 +5446,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:698
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:811
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5460,7 +5460,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:703
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:816
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>)."
@@ -5468,13 +5468,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:706
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:819
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:534 ../v2v/virt-v2v.pod:710
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:823
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5489,7 +5489,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:717
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:830
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8627,7 +8627,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:736
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:849
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8766,7 +8766,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:661
+#: ../v2v/virt-v2v.pod:774
msgid "FILES"
msgstr "ファイル"
@@ -51825,7 +51825,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:868
msgid "Matthew Booth"
msgstr ""
@@ -53411,7 +53411,7 @@ msgstr "デバッグメッセージを有効にします。"
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:128
+#: ../v2v/virt-v2v.pod:132
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -53897,7 +53897,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:618
+#: ../v2v/virt-v2v.pod:731
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53930,7 +53930,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:630
+#: ../v2v/virt-v2v.pod:743
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53938,13 +53938,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:633
+#: ../v2v/virt-v2v.pod:746
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:752
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53952,7 +53952,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:642
+#: ../v2v/virt-v2v.pod:755
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53963,7 +53963,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:759
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54661,7 +54661,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:314
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54844,7 +54844,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:794
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54858,7 +54858,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:797
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 "
@@ -54866,7 +54866,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:801
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54881,7 +54881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:809
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87549,34 +87549,39 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:90
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ \\\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
" -o rhev -os rhev.nfs:/export_domain --network rhevm esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:114
#, no-wrap
msgid ""
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
-#, no-wrap
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:104
+#, fuzzy, no-wrap
+#| msgid ""
+#| " virt-rescue --ro -a /path/to/disk.img\n"
+#| "\n"
msgid ""
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
msgstr ""
+" virt-rescue --ro -a /path/to/disk.img\n"
+"\n"
#. type: textblock
#: ../v2v/virt-v2v.pod:18
@@ -87675,39 +87680,45 @@ msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:66
-msgid "Convert from VMware ESX server to local libvirt"
+msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:68
msgid ""
-"You have a VMware ESX server called C<esx.example.com>. You want to convert "
-"a guest called C<esx_guest> to run locally under libvirt."
+"You have a VMware vCenter server called C<esx.example.com>, a datacenter "
+"called C<Datacenter>, and an ESXi hypervisor called C<esxi>. You want to "
+"convert a guest called C<esx_guest> to run locally under libvirt."
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:73
#, no-wrap
msgid ""
-" virt-v2v -ic esx://example.com esx_guest\n"
+" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:75
msgid ""
"In this case you will most likely have to run virt-v2v as C<root>, since it "
"needs to talk to the system libvirt daemon and copy the guest disks to C</"
"var/lib/libvirt/images>."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr ""
+
#. type: =head2
-#: ../v2v/virt-v2v.pod:77
+#: ../v2v/virt-v2v.pod:81
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:79
+#: ../v2v/virt-v2v.pod:83
msgid ""
"This is the same as the previous example, except you want to send the guest "
"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
@@ -87718,12 +87729,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:89
+#: ../v2v/virt-v2v.pod:93
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:91
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Note that after conversion, the guest will appear in the RHEV-M Export "
"Storage Domain, from where you will need to import it using the RHEV-M user "
@@ -87731,28 +87742,28 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:99
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "空のディスクイメージを作成します"
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:101
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:106
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
-"case) writes the converted result to C</tmp>."
+"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:109
msgid ""
"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
"formatdomain.html> describing the input guest (if you can get the source "
@@ -87761,47 +87772,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:116
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:128
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:130
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:134
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:138
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i disk>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:140
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:142
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -87811,115 +87822,123 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:148
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:150
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:152
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:155
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:155
+#: ../v2v/virt-v2v.pod:159
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
-"name, amount of memory), and also to locate the input disks."
+"name, amount of memory), and also to locate the input disks. See L</MINIMAL "
+"XML FOR -i libvirtxml OPTION> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:164
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:166
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-i disk>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:168
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:170
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:173
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:176
+#, fuzzy
+#| msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
+msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
+
#. type: =item
-#: ../v2v/virt-v2v.pod:172
+#: ../v2v/virt-v2v.pod:178
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:194
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:196
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -87927,28 +87946,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:196
+#: ../v2v/virt-v2v.pod:202
#, fuzzy
#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:198
+#: ../v2v/virt-v2v.pod:204
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:200
+#: ../v2v/virt-v2v.pod:206
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -87956,48 +87975,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:213
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:216
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:214
+#: ../v2v/virt-v2v.pod:220
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "以下の L</1 MB パーティションアライメント> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:225
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:227
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:229
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -88005,7 +88024,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -88015,38 +88034,38 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:240
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o option>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:242
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-o rhev>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:244
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:246
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:248
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -88055,97 +88074,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:255
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:253
+#: ../v2v/virt-v2v.pod:259
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:261
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:264
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:261
+#: ../v2v/virt-v2v.pod:267
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:263
+#: ../v2v/virt-v2v.pod:269
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:271
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:273
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:275
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:278
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:280
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:282
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:285
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:287
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:284
+#: ../v2v/virt-v2v.pod:290
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -88153,7 +88172,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:286
+#: ../v2v/virt-v2v.pod:292
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -88161,7 +88180,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:296
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -88169,21 +88188,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:301
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:304
#, fuzzy
#| msgid "B<--parts>"
msgid "B<--print-source>"
msgstr "B<--parts>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:306
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -88191,105 +88210,105 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:316
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:318
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:320
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:322
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:322
+#: ../v2v/virt-v2v.pod:328
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:332
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:336
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:340
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:342
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:345
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:349
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:352
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:358
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:360
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:362
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:364
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:366
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -88300,14 +88319,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:374
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:377
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -88316,7 +88335,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:382
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -88324,7 +88343,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:386
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -88333,7 +88352,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:391
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -88343,19 +88362,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:409
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:411
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:413
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -88363,12 +88382,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:424
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:420
+#: ../v2v/virt-v2v.pod:426
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -88377,7 +88396,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:431
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -88385,7 +88404,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:435
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -88393,7 +88412,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:437
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -88406,7 +88425,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:444
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -88415,7 +88434,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88427,7 +88446,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:453
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88436,7 +88455,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88444,19 +88463,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:458
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:460
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:463
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -88464,7 +88483,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:462
+#: ../v2v/virt-v2v.pod:468
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -88472,7 +88491,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:473
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88480,7 +88499,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:469
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88488,7 +88507,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88498,7 +88517,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88506,7 +88525,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88514,7 +88533,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:479
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88522,7 +88541,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88530,7 +88549,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:489
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88538,7 +88557,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88546,7 +88565,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:487
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88555,12 +88574,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:496
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:492
+#: ../v2v/virt-v2v.pod:498
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -88568,7 +88587,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:503
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -88578,14 +88597,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:509
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -88596,21 +88615,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:517
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:520
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:523
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -88618,12 +88637,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:519
+#: ../v2v/virt-v2v.pod:525
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:521
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -88631,14 +88650,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:529
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:532
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -88649,7 +88668,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -88657,115 +88676,277 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:539
+msgid "INPUT FROM VMWARE VCENTER SERVER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:541
+msgid "Virt-v2v is able to import guests from VMware vCenter Server."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:543
+msgid ""
+"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:546
+msgid ""
+"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
+"should be I<-i libvirt>. As this is the default, you don't need to specify "
+"it on the command line."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:550
+msgid "The libvirt URI of a vCenter server looks something like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:552
+#, no-wrap
+msgid ""
+" vpx://user@server/Datacenter/esxi\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:554
+msgid ""
+"where C<user@> is the (optional, but recommended) user to connect as, "
+"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
+"name of the datacenter, and C<esxi> is the name of the ESXi hypervisor "
+"running the guest."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:559
+msgid ""
+"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:561
+msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:563
+msgid ""
+"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:566
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
+" Enter root's password for esx.example.com: ***\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:569
+#, no-wrap
+msgid ""
+" Id Name State\n"
+" ----------------------------------------------------\n"
+" - Fedora 20 shut off\n"
+" - Windows 2003 shut off\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:574
+msgid ""
+"If you get an error \"Peer certificate cannot be authenticated with given CA "
+"certificates\" or similar, then you can either import the ESX host's "
+"certificate, or bypass signature verification by adding the C<?no_verify=1> "
+"flag:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:579
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:581
+msgid ""
+"You should also try dumping the metadata from any guest on your server, like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:584
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
+" <domain type='vmware'>\n"
+" <name>Windows 2003</name>\n"
+" [...]\n"
+" </domain>\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:590
+msgid ""
+"B<If the above commands do not work, then virt-v2v is not going to work "
+"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
+"before continuing."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:594
+msgid "ESX: IMPORTING A GUEST"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:596
+msgid "To import a particular guest from vCenter Server, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:598
+#, no-wrap
+msgid ""
+" $ virt-v2v -ic 'esx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
+" \"Windows 2003\" \\\n"
+" -o local -os /var/tmp\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:602
+msgid ""
+"where C<Windows 2003> is the name of the guest (which must be shut down)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:605
+msgid ""
+"In this case the output flags are set to write the converted guest to a "
+"temporary directory as this is just an example, but you can also write to "
+"libvirt or RHEV."
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:609
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:535
+#: ../v2v/virt-v2v.pod:611
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:618
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:623
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:628
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:632
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:639
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
-" virt-v2v [...] -o local -os /tmp\n"
+" virt-v2v [...] -o local -os /var/tmp\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:568
+#: ../v2v/virt-v2v.pod:644
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
-msgid "This creates two (or more) files in C</tmp> called:"
+msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:646
#, no-wrap
msgid ""
-" /tmp/NAME.xml # the libvirt XML (metadata)\n"
-" /tmp/NAME-sda # the guest's first disk\n"
+" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
+" /var/tmp/NAME-sda # the guest's first disk\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:649
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:577
+#: ../v2v/virt-v2v.pod:653
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:655
#, no-wrap
msgid ""
-" size=$(stat -c%s /tmp/NAME-sda)\n"
+" size=$(stat -c%s /var/tmp/NAME-sda)\n"
" virsh vol-create-as POOL NAME-sda $size --format raw\n"
-" virsh vol-upload --pool POOL NAME-sda /tmp/NAME-sda\n"
+" virsh vol-upload --pool POOL NAME-sda /var/tmp/NAME-sda\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:585
+#: ../v2v/virt-v2v.pod:661
msgid ""
-"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
-"words, locate the following bit of XML:"
+"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
+"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:664
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
" <driver name='qemu' type='raw' cache='none' />\n"
-" <source file='/tmp/NAME-sda' />\n"
+" <source file='/var/tmp/NAME-sda' />\n"
" <target dev='hda' bus='ide' />\n"
" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:670
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -88773,7 +88954,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -88785,20 +88966,73 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:606
+#: ../v2v/virt-v2v.pod:682
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:608
+#: ../v2v/virt-v2v.pod:684
+#, no-wrap
+msgid ""
+" virsh define /var/tmp/NAME.xml\n"
+"\n"
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:688
+msgid "MINIMAL XML FOR -i libvirtxml OPTION"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:690
+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:694
+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 "
+"instead."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:698
#, no-wrap
msgid ""
-" virsh define /tmp/NAME.xml\n"
+" <domain type='kvm'>\n"
+" <name>NAME</name>\n"
+" <memory>1048576</memory>\n"
+" <vcpu>2</vcpu>\n"
+" <os>\n"
+" <type arch='x86_64'>hvm</type>\n"
+" <boot dev='hd'/>\n"
+" </os>\n"
+" <features>\n"
+" <acpi/>\n"
+" <apic/>\n"
+" <pae/>\n"
+" </features>\n"
+" <devices>\n"
+" <disk type='file' device='disk'>\n"
+" <driver name='qemu' type='raw'/>\n"
+" <source file='/path/to/disk/image'/>\n"
+" <target dev='hda' bus='ide'/>\n"
+" </disk>\n"
+" <interface type='network'>\n"
+" <mac address='52:54:00:01:02:03'/>\n"
+" <source network='default'/>\n"
+" <model type='rtl8139'/>\n"
+" </interface>\n"
+" </devices>\n"
+" </domain>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:614
+#: ../v2v/virt-v2v.pod:727
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 "
@@ -88806,14 +89040,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:733
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:623
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88823,7 +89057,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:652
+#: ../v2v/virt-v2v.pod:765
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 "
@@ -88831,36 +89065,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:771
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:665
+#: ../v2v/virt-v2v.pod:778
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:780 ../v2v/virt-v2v.pod:834
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:782
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:679
+#: ../v2v/virt-v2v.pod:792
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:803
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 "
@@ -88870,31 +89104,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:813
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:825
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:827
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:719
+#: ../v2v/virt-v2v.pod:832
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:836
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. "
@@ -88904,14 +89138,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:842
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:740
+#: ../v2v/virt-v2v.pod:853
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
@@ -88925,6 +89159,6 @@ msgstr ""
"L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:870
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 8869e11..f7d37f4 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.31\n"
+"Project-Id-Version: libguestfs 1.27.32\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-24 21:20+0200\n"
+"POT-Creation-Date: 2014-08-28 21:59+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"
@@ -246,12 +246,12 @@ msgid "If you just want the exit code with no output, use the I<-q> option."
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
+#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
+#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
msgid "B<--help>"
msgstr ""
@@ -421,12 +421,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:304
+#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:310
msgid "B<-q>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
+#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:312
msgid "B<--quiet>"
msgstr ""
@@ -458,42 +458,42 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
msgid "B<--verbose>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:395
+#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:401
msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
msgid "B<-x>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
+#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
msgid "Enable tracing of libguestfs API calls."
msgstr ""
@@ -774,7 +774,7 @@ msgid "This program returns:"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
msgid "*"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:675
+#: ../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 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:788
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:1253 ../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:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1593,7 +1593,7 @@ msgid "You can combine these options, and have multiple options of all types."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
+#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:126
msgid "Display help."
msgstr ""
@@ -1969,12 +1969,12 @@ msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:184
msgid "B<--machine-readable>"
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:186
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
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:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
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:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583 ../v2v/virt-v2v.pod:650
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:659 ../v2v/virt-v2v.pod:763
msgid "3."
msgstr ""
@@ -2098,7 +2098,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:604
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:680
msgid "4."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:725
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -4539,7 +4539,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:740
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:522 ../v2v/virt-v2v.pod:698
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:811
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:527 ../v2v/virt-v2v.pod:703
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:816
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:530 ../v2v/virt-v2v.pod:706
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:819
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:534 ../v2v/virt-v2v.pod:710
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:823
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:540 ../v2v/virt-v2v.pod:717
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:830
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7336,7 +7336,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:546 ../v2v/virt-v2v.pod:736
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:849
msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -7462,7 +7462,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:661
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:774
msgid "FILES"
msgstr ""
@@ -47502,7 +47502,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:868
msgid "Matthew Booth"
msgstr ""
@@ -48953,7 +48953,7 @@ msgid "Enable debugging messages."
msgstr ""
#. type: =item
-#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:128
+#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:132
msgid "B<--debug-gc>"
msgstr ""
@@ -49401,7 +49401,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:618
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:731
msgid "There are two ways to use this option."
msgstr ""
@@ -49426,26 +49426,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:630
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:743
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:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:633
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:746
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:639
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:752
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
msgstr ""
#. type: verbatim
-#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:642
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:755
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -49453,7 +49453,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:646
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:759
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -50095,7 +50095,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:314
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -50268,7 +50268,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:794
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -50282,7 +50282,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:797
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 "
@@ -50290,7 +50290,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:801
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50305,7 +50305,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:809
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78343,32 +78343,32 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:90
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ \\\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
" -o rhev -os rhev.nfs:/export_domain --network rhevm esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:114
#, no-wrap
msgid ""
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:104
#, no-wrap
msgid ""
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
msgstr ""
@@ -78465,39 +78465,45 @@ msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:66
-msgid "Convert from VMware ESX server to local libvirt"
+msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:68
msgid ""
-"You have a VMware ESX server called C<esx.example.com>. You want to convert "
-"a guest called C<esx_guest> to run locally under libvirt."
+"You have a VMware vCenter server called C<esx.example.com>, a datacenter "
+"called C<Datacenter>, and an ESXi hypervisor called C<esxi>. You want to "
+"convert a guest called C<esx_guest> to run locally under libvirt."
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:73
#, no-wrap
msgid ""
-" virt-v2v -ic esx://example.com esx_guest\n"
+" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:75
msgid ""
"In this case you will most likely have to run virt-v2v as C<root>, since it "
"needs to talk to the system libvirt daemon and copy the guest disks to "
"C</var/lib/libvirt/images>."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr ""
+
#. type: =head2
-#: ../v2v/virt-v2v.pod:77
+#: ../v2v/virt-v2v.pod:81
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:79
+#: ../v2v/virt-v2v.pod:83
msgid ""
"This is the same as the previous example, except you want to send the guest "
"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
@@ -78508,12 +78514,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:89
+#: ../v2v/virt-v2v.pod:93
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:91
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Note that after conversion, the guest will appear in the RHEV-M Export "
"Storage Domain, from where you will need to import it using the RHEV-M user "
@@ -78521,26 +78527,26 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:99
msgid "Convert disk image to disk image"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:101
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:106
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
-"case) writes the converted result to C</tmp>."
+"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:109
msgid ""
"A more complex method is to write some L<libvirt "
"XML|http://libvirt.org/formatdomain.html> describing the input guest (if you "
@@ -78549,41 +78555,41 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:116
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:128
msgid "B<--bridge> ..."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:130
msgid "See I<--network> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:134
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:138
msgid "B<-i disk>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:140
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:142
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -78593,103 +78599,109 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:148
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:150
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:152
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:155
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:155
+#: ../v2v/virt-v2v.pod:159
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
-"name, amount of memory), and also to locate the input disks."
+"name, amount of memory), and also to locate the input disks. See L</MINIMAL "
+"XML FOR -i libvirtxml OPTION> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:164
msgid "B<-i local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:166
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:168
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:170
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:173
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:176
+msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr ""
+
#. type: =item
-#: ../v2v/virt-v2v.pod:172
+#: ../v2v/virt-v2v.pod:178
msgid "B<-if> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
msgid "B<--network> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
msgid "B<--network> out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:194
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:196
msgid "B<--bridge> out"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -78697,24 +78709,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:196
+#: ../v2v/virt-v2v.pod:202
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:198
+#: ../v2v/virt-v2v.pod:204
msgid "B<--no-copy>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:200
+#: ../v2v/virt-v2v.pod:206
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -78722,46 +78734,46 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:213
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:216
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:214
+#: ../v2v/virt-v2v.pod:220
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:225
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:227
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:229
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -78769,7 +78781,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -78779,34 +78791,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
msgid ""
"and a libvirt XML file is created containing guest metadata "
"(C</dir/name.xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:240
msgid "B<-o ovirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:242
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:244
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:246
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:248
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -78815,97 +78827,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:255
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:253
+#: ../v2v/virt-v2v.pod:259
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:261
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:264
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:261
+#: ../v2v/virt-v2v.pod:267
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:263
+#: ../v2v/virt-v2v.pod:269
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:271
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:273
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:275
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:278
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:280
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:282
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
"pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:285
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:287
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:284
+#: ../v2v/virt-v2v.pod:290
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -78913,7 +78925,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:286
+#: ../v2v/virt-v2v.pod:292
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -78921,7 +78933,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:296
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -78929,19 +78941,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:301
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:304
msgid "B<--print-source>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:306
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -78949,103 +78961,103 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:316
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:318
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:320
msgid "B<--rhev-vm-uuid> UUID"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:322
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:322
+#: ../v2v/virt-v2v.pod:328
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:332
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:336
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:340
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:342
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:345
msgid ""
"If the guest has more than one virtual disk, then you should use "
"I<--rhev-vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:349
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:352
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:358
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:360
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:362
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:364
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:366
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -79056,14 +79068,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:374
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:377
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -79072,7 +79084,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:382
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -79080,7 +79092,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:386
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -79089,7 +79101,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:391
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -79099,17 +79111,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:409
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:411
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:413
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -79117,12 +79129,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:424
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:420
+#: ../v2v/virt-v2v.pod:426
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -79131,7 +79143,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:431
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -79139,7 +79151,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:435
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -79147,7 +79159,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:437
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -79160,7 +79172,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:444
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -79169,7 +79181,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -79181,7 +79193,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:453
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -79190,7 +79202,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -79198,19 +79210,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:458
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:460
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:463
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -79218,7 +79230,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:462
+#: ../v2v/virt-v2v.pod:468
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -79226,7 +79238,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:473
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -79234,7 +79246,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:469
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -79242,7 +79254,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -79252,7 +79264,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -79260,7 +79272,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -79268,7 +79280,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:479
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -79276,7 +79288,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -79284,7 +79296,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:489
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -79292,7 +79304,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -79300,7 +79312,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:487
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -79309,12 +79321,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:496
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:492
+#: ../v2v/virt-v2v.pod:498
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -79322,7 +79334,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:503
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -79332,14 +79344,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:509
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79350,21 +79362,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:517
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:520
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:523
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -79372,12 +79384,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:519
+#: ../v2v/virt-v2v.pod:525
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:521
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -79385,14 +79397,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:529
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:532
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79403,7 +79415,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -79411,113 +79423,275 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:539
+msgid "INPUT FROM VMWARE VCENTER SERVER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:541
+msgid "Virt-v2v is able to import guests from VMware vCenter Server."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:543
+msgid "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:546
+msgid ""
+"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
+"should be I<-i libvirt>. As this is the default, you don't need to specify "
+"it on the command line."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:550
+msgid "The libvirt URI of a vCenter server looks something like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:552
+#, no-wrap
+msgid ""
+" vpx://user@server/Datacenter/esxi\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:554
+msgid ""
+"where C<user@> is the (optional, but recommended) user to connect as, "
+"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
+"name of the datacenter, and C<esxi> is the name of the ESXi hypervisor "
+"running the guest."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:559
+msgid "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:561
+msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:563
+msgid ""
+"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:566
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
+" Enter root's password for esx.example.com: ***\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:569
+#, no-wrap
+msgid ""
+" Id Name State\n"
+" ----------------------------------------------------\n"
+" - Fedora 20 shut off\n"
+" - Windows 2003 shut off\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:574
+msgid ""
+"If you get an error \"Peer certificate cannot be authenticated with given CA "
+"certificates\" or similar, then you can either import the ESX host's "
+"certificate, or bypass signature verification by adding the C<?no_verify=1> "
+"flag:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:579
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list "
+"--all\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:581
+msgid ""
+"You should also try dumping the metadata from any guest on your server, like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:584
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows "
+"2003\"\n"
+" <domain type='vmware'>\n"
+" <name>Windows 2003</name>\n"
+" [...]\n"
+" </domain>\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:590
+msgid ""
+"B<If the above commands do not work, then virt-v2v is not going to work "
+"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
+"before continuing."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:594
+msgid "ESX: IMPORTING A GUEST"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:596
+msgid "To import a particular guest from vCenter Server, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:598
+#, no-wrap
+msgid ""
+" $ virt-v2v -ic 'esx://root@esx.example.com/Datacenter/esxi?no_verify=1' "
+"\\\n"
+" \"Windows 2003\" \\\n"
+" -o local -os /var/tmp\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:602
+msgid "where C<Windows 2003> is the name of the guest (which must be shut down)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:605
+msgid ""
+"In this case the output flags are set to write the converted guest to a "
+"temporary directory as this is just an example, but you can also write to "
+"libvirt or RHEV."
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:609
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:535
+#: ../v2v/virt-v2v.pod:611
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a "
"libvirt-managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:618
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:623
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:628
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:632
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:639
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
-" virt-v2v [...] -o local -os /tmp\n"
+" virt-v2v [...] -o local -os /var/tmp\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:568
-msgid "This creates two (or more) files in C</tmp> called:"
+#: ../v2v/virt-v2v.pod:644
+msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:646
#, no-wrap
msgid ""
-" /tmp/NAME.xml # the libvirt XML (metadata)\n"
-" /tmp/NAME-sda # the guest's first disk\n"
+" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
+" /var/tmp/NAME-sda # the guest's first disk\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:649
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:577
+#: ../v2v/virt-v2v.pod:653
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:655
#, no-wrap
msgid ""
-" size=$(stat -c%s /tmp/NAME-sda)\n"
+" size=$(stat -c%s /var/tmp/NAME-sda)\n"
" virsh vol-create-as POOL NAME-sda $size --format raw\n"
-" virsh vol-upload --pool POOL NAME-sda /tmp/NAME-sda\n"
+" virsh vol-upload --pool POOL NAME-sda /var/tmp/NAME-sda\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:585
+#: ../v2v/virt-v2v.pod:661
msgid ""
-"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
-"words, locate the following bit of XML:"
+"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
+"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:664
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
" <driver name='qemu' type='raw' cache='none' />\n"
-" <source file='/tmp/NAME-sda' />\n"
+" <source file='/var/tmp/NAME-sda' />\n"
" <target dev='hda' bus='ide' />\n"
" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:670
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -79525,7 +79699,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -79537,20 +79711,73 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:606
+#: ../v2v/virt-v2v.pod:682
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:608
+#: ../v2v/virt-v2v.pod:684
+#, no-wrap
+msgid ""
+" virsh define /var/tmp/NAME.xml\n"
+"\n"
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:688
+msgid "MINIMAL XML FOR -i libvirtxml OPTION"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:690
+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:694
+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 "
+"instead."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:698
#, no-wrap
msgid ""
-" virsh define /tmp/NAME.xml\n"
+" <domain type='kvm'>\n"
+" <name>NAME</name>\n"
+" <memory>1048576</memory>\n"
+" <vcpu>2</vcpu>\n"
+" <os>\n"
+" <type arch='x86_64'>hvm</type>\n"
+" <boot dev='hd'/>\n"
+" </os>\n"
+" <features>\n"
+" <acpi/>\n"
+" <apic/>\n"
+" <pae/>\n"
+" </features>\n"
+" <devices>\n"
+" <disk type='file' device='disk'>\n"
+" <driver name='qemu' type='raw'/>\n"
+" <source file='/path/to/disk/image'/>\n"
+" <target dev='hda' bus='ide'/>\n"
+" </disk>\n"
+" <interface type='network'>\n"
+" <mac address='52:54:00:01:02:03'/>\n"
+" <source network='default'/>\n"
+" <model type='rtl8139'/>\n"
+" </interface>\n"
+" </devices>\n"
+" </domain>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:614
+#: ../v2v/virt-v2v.pod:727
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 "
@@ -79558,14 +79785,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:733
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:623
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -79575,7 +79802,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:652
+#: ../v2v/virt-v2v.pod:765
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 "
@@ -79583,36 +79810,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:771
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:665
+#: ../v2v/virt-v2v.pod:778
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:780 ../v2v/virt-v2v.pod:834
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:782
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:679
+#: ../v2v/virt-v2v.pod:792
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:803
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 "
@@ -79622,31 +79849,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:813
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:825
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:827
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:719
+#: ../v2v/virt-v2v.pod:832
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:836
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. "
@@ -79656,14 +79883,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:842
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:740
+#: ../v2v/virt-v2v.pod:853
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)>, "
@@ -79671,6 +79898,6 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:870
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index b74d0ec..1763530 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-08-21 17:07+0200\n"
+"POT-Creation-Date: 2014-08-28 21:59+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -397,7 +397,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:116
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:120
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
@@ -416,7 +416,7 @@ msgstr "ПАРАМЕТРИ"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:120
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:124
msgid "B<--help>"
msgstr "B<--help>"
@@ -731,7 +731,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:310
msgid "B<-q>"
msgstr "B<-q>"
@@ -739,7 +739,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:306
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:312
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -789,7 +789,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:391
+#: ../v2v/virt-v2v.pod:397
msgid "B<-v>"
msgstr "B<-v>"
@@ -804,7 +804,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:393
+#: ../v2v/virt-v2v.pod:399
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -816,7 +816,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:401
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -834,7 +834,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:403
msgid "B<-V>"
msgstr "B<-V>"
@@ -853,7 +853,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:399
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:405
msgid "B<--version>"
msgstr "B<--version>"
@@ -868,7 +868,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:401
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:407
msgid "Display version number and exit."
msgstr "Показати дані щодо версії і завершити роботу."
@@ -883,7 +883,7 @@ msgstr "Показати дані щодо версії і завершити р
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:412
+#: ../v2v/virt-v2v.pod:418
msgid "B<-x>"
msgstr "B<-x>"
@@ -896,7 +896,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:414
+#: ../v2v/virt-v2v.pod:420
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1380,9 +1380,9 @@ msgstr "Ця програма повертає:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:320 ../v2v/virt-v2v.pod:324
-#: ../v2v/virt-v2v.pod:328 ../v2v/virt-v2v.pod:540 ../v2v/virt-v2v.pod:545
-#: ../v2v/virt-v2v.pod:550
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:326 ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:334 ../v2v/virt-v2v.pod:616 ../v2v/virt-v2v.pod:621
+#: ../v2v/virt-v2v.pod:626
msgid "*"
msgstr "*"
@@ -1459,7 +1459,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../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:738
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:851
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1499,7 +1499,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:753
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:866
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:4816
#: ../sysprep/virt-sysprep.pod:571 ../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:759
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:872
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1845,7 +1845,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:675
+#: ../v2v/virt-v2v.pod:788
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1883,7 +1883,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:751
+#: ../v2v/virt-v2v.pod:864
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1913,7 +1913,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:761
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:874
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2409,7 +2409,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:122
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:126
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -2799,13 +2799,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:178
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:184
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:180
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:186
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2902,7 +2902,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:561 ../v2v/virt-v2v.pod:637
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:637 ../v2v/virt-v2v.pod:750
msgid "1."
msgstr "1."
@@ -2922,7 +2922,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:575 ../v2v/virt-v2v.pod:644
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:651 ../v2v/virt-v2v.pod:757
msgid "2."
msgstr "2."
@@ -2940,8 +2940,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:583
-#: ../v2v/virt-v2v.pod:650
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:763
msgid "3."
msgstr "3."
@@ -2956,7 +2956,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:680
msgid "4."
msgstr "4."
@@ -5507,7 +5507,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:612
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:725
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5542,7 +5542,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:627
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:740
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5591,7 +5591,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:698
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:811
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5605,7 +5605,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:703
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:816
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>)."
@@ -5613,13 +5613,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:706
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:819
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:534 ../v2v/virt-v2v.pod:710
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:823
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5634,7 +5634,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:717
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:830
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8694,7 +8694,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:736
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:849
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8829,7 +8829,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:661
+#: ../v2v/virt-v2v.pod:774
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50843,7 +50843,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:755
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:868
msgid "Matthew Booth"
msgstr ""
@@ -52382,7 +52382,7 @@ msgstr "Увімкнути показ діагностичних повідом
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:128
+#: ../v2v/virt-v2v.pod:132
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -52847,7 +52847,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:618
+#: ../v2v/virt-v2v.pod:731
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52880,7 +52880,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:630
+#: ../v2v/virt-v2v.pod:743
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52888,13 +52888,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:633
+#: ../v2v/virt-v2v.pod:746
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:752
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52902,7 +52902,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:642
+#: ../v2v/virt-v2v.pod:755
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52913,7 +52913,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:759
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53589,7 +53589,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:308
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:314
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53769,7 +53769,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:681
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:794
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53783,7 +53783,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:684
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:797
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 "
@@ -53791,7 +53791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:688
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:801
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53806,7 +53806,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:696
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:809
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86472,35 +86472,40 @@ msgstr ""
#: ../v2v/virt-v2v.pod:7
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ esx_guest\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:90
#, no-wrap
msgid ""
-" virt-v2v -ic esx://esx.example.com/ \\\n"
+" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
" -o rhev -os rhev.nfs:/export_domain --network rhevm esx_guest\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:110
-#, no-wrap
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:114
+#, fuzzy, no-wrap
+#| msgid ""
+#| " virt-builder fedora-20 -o mydisk.img\n"
+#| "\n"
msgid ""
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
msgstr ""
+" virt-builder fedora-20 -o mydisk.img\n"
+"\n"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:104
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
#| "\n"
msgid ""
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
msgstr ""
" virt-builder fedora-20 -o mydisk.img\n"
@@ -86603,39 +86608,45 @@ msgstr ""
#. type: =head2
#: ../v2v/virt-v2v.pod:66
-msgid "Convert from VMware ESX server to local libvirt"
+msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:68
msgid ""
-"You have a VMware ESX server called C<esx.example.com>. You want to convert "
-"a guest called C<esx_guest> to run locally under libvirt."
+"You have a VMware vCenter server called C<esx.example.com>, a datacenter "
+"called C<Datacenter>, and an ESXi hypervisor called C<esxi>. You want to "
+"convert a guest called C<esx_guest> to run locally under libvirt."
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:73
#, no-wrap
msgid ""
-" virt-v2v -ic esx://example.com esx_guest\n"
+" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:75
msgid ""
"In this case you will most likely have to run virt-v2v as C<root>, since it "
"needs to talk to the system libvirt daemon and copy the guest disks to C</"
"var/lib/libvirt/images>."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:79
+msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr ""
+
#. type: =head2
-#: ../v2v/virt-v2v.pod:77
+#: ../v2v/virt-v2v.pod:81
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:79
+#: ../v2v/virt-v2v.pod:83
msgid ""
"This is the same as the previous example, except you want to send the guest "
"to a RHEV-M Export Storage Domain which is located remotely (over NFS) at "
@@ -86646,12 +86657,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:89
+#: ../v2v/virt-v2v.pod:93
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:91
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Note that after conversion, the guest will appear in the RHEV-M Export "
"Storage Domain, from where you will need to import it using the RHEV-M user "
@@ -86659,28 +86670,28 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:99
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "Створення порожніх образів дисків"
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:101
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:106
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
-"case) writes the converted result to C</tmp>."
+"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:105
+#: ../v2v/virt-v2v.pod:109
msgid ""
"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
"formatdomain.html> describing the input guest (if you can get the source "
@@ -86689,47 +86700,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:116
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:128
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:130
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:134
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:138
#, fuzzy
#| msgid "B<gdisk>"
msgid "B<-i disk>"
msgstr "B<gdisk>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:140
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:142
msgid ""
"In this mode you can read a virtual machine disk image with no metadata. "
"virt-v2v tries to guess the best default metadata. This is usually adequate "
@@ -86739,113 +86750,119 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:148
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:150
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:152
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:155
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:155
+#: ../v2v/virt-v2v.pod:159
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
-"name, amount of memory), and also to locate the input disks."
+"name, amount of memory), and also to locate the input disks. See L</MINIMAL "
+"XML FOR -i libvirtxml OPTION> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:164
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:166
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:168
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:170
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:169
+#: ../v2v/virt-v2v.pod:173
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
+#. type: textblock
+#: ../v2v/virt-v2v.pod:176
+msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
+msgstr ""
+
#. type: =item
-#: ../v2v/virt-v2v.pod:172
+#: ../v2v/virt-v2v.pod:178
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:174
+#: ../v2v/virt-v2v.pod:180
msgid ""
"For I<-i disk> only, this specifies the format of the input disk image. For "
"other input methods you should specify the input format in the metadata."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:190
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:192
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:194
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:196
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -86853,28 +86870,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:196
+#: ../v2v/virt-v2v.pod:202
#, fuzzy
#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr "Див. L</OPENING DISKS FOR READ AND WRITE> нижче."
#. type: =item
-#: ../v2v/virt-v2v.pod:198
+#: ../v2v/virt-v2v.pod:204
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:200
+#: ../v2v/virt-v2v.pod:206
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:209
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -86882,48 +86899,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:213
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:216
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:212
+#: ../v2v/virt-v2v.pod:218
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:214
+#: ../v2v/virt-v2v.pod:220
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:223
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "див. L</ВИРІВНЮВАННЯ РОЗДІЛІВ НА ПОЗНАЧКИ 1 МБ> нижче."
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:225
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:227
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:229
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -86931,7 +86948,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:233
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -86941,36 +86958,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:237
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:240
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o параметр>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:242
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:244
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:246
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:248
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -86979,97 +86996,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:253
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:255
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:253
+#: ../v2v/virt-v2v.pod:259
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:261
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:264
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:261
+#: ../v2v/virt-v2v.pod:267
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:263
+#: ../v2v/virt-v2v.pod:269
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:271
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:273
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:269
+#: ../v2v/virt-v2v.pod:275
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:278
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:280
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:282
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:285
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:287
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:284
+#: ../v2v/virt-v2v.pod:290
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87077,7 +87094,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:286
+#: ../v2v/virt-v2v.pod:292
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -87085,7 +87102,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:296
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -87093,21 +87110,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:301
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:304
#, fuzzy
#| msgid "B<--print-cache>"
msgid "B<--print-source>"
msgstr "B<--print-cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:306
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -87115,105 +87132,105 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:316
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:318
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:320
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:322
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:322
+#: ../v2v/virt-v2v.pod:328
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:332
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:330
+#: ../v2v/virt-v2v.pod:336
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:340
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:342
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:339
+#: ../v2v/virt-v2v.pod:345
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:343
+#: ../v2v/virt-v2v.pod:349
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:352
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:354
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:356
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:358
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:354
+#: ../v2v/virt-v2v.pod:360
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:362
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:358
+#: ../v2v/virt-v2v.pod:364
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:366
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -87224,14 +87241,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:368
+#: ../v2v/virt-v2v.pod:374
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:377
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -87240,7 +87257,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:382
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -87248,7 +87265,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:386
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -87257,7 +87274,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:391
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -87267,19 +87284,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:409
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:411
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:413
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -87287,12 +87304,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:424
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:420
+#: ../v2v/virt-v2v.pod:426
msgid ""
"Older versions of virt-v2v could turn a Xen paravirtualized (PV) guest into "
"a KVM guest by installing a new kernel. This version of virt-v2v does "
@@ -87301,7 +87318,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:431
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87309,7 +87326,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:435
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87317,7 +87334,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:437
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87330,7 +87347,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:444
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87339,7 +87356,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:447
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87351,7 +87368,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:447
+#: ../v2v/virt-v2v.pod:453
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87360,7 +87377,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87368,19 +87385,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:458
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:460
msgid ""
"\"Virtio\" is the name for a set of drivers which make disk (block device), "
"network and other guest operations work much faster on KVM."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:463
msgid ""
"Older versions of virt-v2v could install these drivers for certain Linux "
"guests. This version of virt-v2v does I<not> attempt to install new Linux "
@@ -87388,7 +87405,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:462
+#: ../v2v/virt-v2v.pod:468
msgid ""
"In order to enable virtio, and hence improve performance of the guest after "
"conversion, you should ensure that the B<minimum> versions of packages are "
@@ -87396,7 +87413,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:473
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -87404,7 +87421,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:469
+#: ../v2v/virt-v2v.pod:475
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -87412,7 +87429,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -87422,7 +87439,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:475
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87430,7 +87447,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87438,7 +87455,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:479
+#: ../v2v/virt-v2v.pod:485
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87446,7 +87463,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:487
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87454,7 +87471,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:483
+#: ../v2v/virt-v2v.pod:489
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87462,7 +87479,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87470,7 +87487,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:487
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87479,12 +87496,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:496
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:492
+#: ../v2v/virt-v2v.pod:498
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -87492,7 +87509,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:503
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -87502,14 +87519,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:509
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -87520,21 +87537,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:517
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:520
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:517
+#: ../v2v/virt-v2v.pod:523
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -87542,12 +87559,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:519
+#: ../v2v/virt-v2v.pod:525
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:521
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -87555,14 +87572,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:529
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:532
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -87573,7 +87590,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -87581,115 +87598,282 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:539
+msgid "INPUT FROM VMWARE VCENTER SERVER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:541
+msgid "Virt-v2v is able to import guests from VMware vCenter Server."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:543
+msgid ""
+"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:546
+msgid ""
+"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
+"should be I<-i libvirt>. As this is the default, you don't need to specify "
+"it on the command line."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:550
+msgid "The libvirt URI of a vCenter server looks something like this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:552
+#, no-wrap
+msgid ""
+" vpx://user@server/Datacenter/esxi\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:554
+msgid ""
+"where C<user@> is the (optional, but recommended) user to connect as, "
+"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
+"name of the datacenter, and C<esxi> is the name of the ESXi hypervisor "
+"running the guest."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:559
+msgid ""
+"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:561
+msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:563
+msgid ""
+"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:566
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
+" Enter root's password for esx.example.com: ***\n"
+" \n"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:569
+#, no-wrap
+msgid ""
+" Id Name State\n"
+" ----------------------------------------------------\n"
+" - Fedora 20 shut off\n"
+" - Windows 2003 shut off\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:574
+msgid ""
+"If you get an error \"Peer certificate cannot be authenticated with given CA "
+"certificates\" or similar, then you can either import the ESX host's "
+"certificate, or bypass signature verification by adding the C<?no_verify=1> "
+"flag:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:579
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:581
+msgid ""
+"You should also try dumping the metadata from any guest on your server, like "
+"this:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:584
+#, no-wrap
+msgid ""
+" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
+" <domain type='vmware'>\n"
+" <name>Windows 2003</name>\n"
+" [...]\n"
+" </domain>\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:590
+msgid ""
+"B<If the above commands do not work, then virt-v2v is not going to work "
+"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
+"before continuing."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:594
+msgid "ESX: IMPORTING A GUEST"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:596
+msgid "To import a particular guest from vCenter Server, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:598
+#, no-wrap
+msgid ""
+" $ virt-v2v -ic 'esx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
+" \"Windows 2003\" \\\n"
+" -o local -os /var/tmp\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:602
+msgid ""
+"where C<Windows 2003> is the name of the guest (which must be shut down)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:605
+msgid ""
+"In this case the output flags are set to write the converted guest to a "
+"temporary directory as this is just an example, but you can also write to "
+"libvirt or RHEV."
+msgstr ""
+
+#. type: =head1
+#: ../v2v/virt-v2v.pod:609
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:535
+#: ../v2v/virt-v2v.pod:611
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:618
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:623
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:628
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:632
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:639
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:566
-#, no-wrap
+#: ../v2v/virt-v2v.pod:642
+#, fuzzy, no-wrap
+#| msgid ""
+#| " virt-builder fedora-20 -o mydisk.img\n"
+#| "\n"
msgid ""
-" virt-v2v [...] -o local -os /tmp\n"
+" virt-v2v [...] -o local -os /var/tmp\n"
"\n"
msgstr ""
+" virt-builder fedora-20 -o mydisk.img\n"
+"\n"
#. type: textblock
-#: ../v2v/virt-v2v.pod:568
+#: ../v2v/virt-v2v.pod:644
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
-msgid "This creates two (or more) files in C</tmp> called:"
+msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
#. type: verbatim
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:646
#, no-wrap
msgid ""
-" /tmp/NAME.xml # the libvirt XML (metadata)\n"
-" /tmp/NAME-sda # the guest's first disk\n"
+" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
+" /var/tmp/NAME-sda # the guest's first disk\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:573
+#: ../v2v/virt-v2v.pod:649
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:577
+#: ../v2v/virt-v2v.pod:653
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:655
#, no-wrap
msgid ""
-" size=$(stat -c%s /tmp/NAME-sda)\n"
+" size=$(stat -c%s /var/tmp/NAME-sda)\n"
" virsh vol-create-as POOL NAME-sda $size --format raw\n"
-" virsh vol-upload --pool POOL NAME-sda /tmp/NAME-sda\n"
+" virsh vol-upload --pool POOL NAME-sda /var/tmp/NAME-sda\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:585
+#: ../v2v/virt-v2v.pod:661
msgid ""
-"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
-"words, locate the following bit of XML:"
+"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
+"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:664
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
" <driver name='qemu' type='raw' cache='none' />\n"
-" <source file='/tmp/NAME-sda' />\n"
+" <source file='/var/tmp/NAME-sda' />\n"
" <target dev='hda' bus='ide' />\n"
" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:670
msgid ""
"and change two things: The C<type='file'> attribute must be changed to "
"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
@@ -87697,7 +87881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -87709,20 +87893,73 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:606
+#: ../v2v/virt-v2v.pod:682
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:608
+#: ../v2v/virt-v2v.pod:684
#, no-wrap
msgid ""
-" virsh define /tmp/NAME.xml\n"
+" virsh define /var/tmp/NAME.xml\n"
"\n"
msgstr ""
+#. type: =head1
+#: ../v2v/virt-v2v.pod:688
+msgid "MINIMAL XML FOR -i libvirtxml OPTION"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:690
+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:614
+#: ../v2v/virt-v2v.pod:694
+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 "
+"instead."
+msgstr ""
+
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:698
+#, no-wrap
+msgid ""
+" <domain type='kvm'>\n"
+" <name>NAME</name>\n"
+" <memory>1048576</memory>\n"
+" <vcpu>2</vcpu>\n"
+" <os>\n"
+" <type arch='x86_64'>hvm</type>\n"
+" <boot dev='hd'/>\n"
+" </os>\n"
+" <features>\n"
+" <acpi/>\n"
+" <apic/>\n"
+" <pae/>\n"
+" </features>\n"
+" <devices>\n"
+" <disk type='file' device='disk'>\n"
+" <driver name='qemu' type='raw'/>\n"
+" <source file='/path/to/disk/image'/>\n"
+" <target dev='hda' bus='ide'/>\n"
+" </disk>\n"
+" <interface type='network'>\n"
+" <mac address='52:54:00:01:02:03'/>\n"
+" <source network='default'/>\n"
+" <model type='rtl8139'/>\n"
+" </interface>\n"
+" </devices>\n"
+" </domain>\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:727
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 "
@@ -87730,14 +87967,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:733
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:623
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -87747,7 +87984,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:652
+#: ../v2v/virt-v2v.pod:765
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 "
@@ -87755,36 +87992,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:771
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:665
+#: ../v2v/virt-v2v.pod:778
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667 ../v2v/virt-v2v.pod:721
+#: ../v2v/virt-v2v.pod:780 ../v2v/virt-v2v.pod:834
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:782
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:679
+#: ../v2v/virt-v2v.pod:792
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:803
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 "
@@ -87794,31 +88031,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:813
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:825
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:827
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:719
+#: ../v2v/virt-v2v.pod:832
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:723
+#: ../v2v/virt-v2v.pod:836
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. "
@@ -87828,14 +88065,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:729
+#: ../v2v/virt-v2v.pod:842
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:740
+#: ../v2v/virt-v2v.pod:853
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
@@ -87851,6 +88088,6 @@ msgstr ""
"libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:870
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 56f43a2..72f4199 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/es.po b/po/es.po
index 5e44c01..f0a96bb 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -86,7 +86,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -246,9 +246,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -678,14 +678,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -703,7 +703,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -765,13 +765,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -783,15 +783,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -807,7 +807,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -984,6 +984,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1022,7 +1032,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1030,7 +1040,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1090,13 +1100,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1110,7 +1120,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1180,7 +1190,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1194,7 +1204,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1262,6 +1272,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1390,7 +1404,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1837,7 +1851,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1891,7 +1905,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1955,7 +1969,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1985,10 +1999,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2023,7 +2033,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2065,7 +2075,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2113,38 +2123,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2172,14 +2182,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2201,7 +2211,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2215,7 +2225,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2243,7 +2281,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2288,11 +2326,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2304,7 +2354,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2312,7 +2362,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2324,7 +2374,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2359,11 +2409,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2373,7 +2423,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2425,11 +2475,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2441,7 +2491,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2457,7 +2507,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2466,7 +2516,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2476,7 +2526,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2485,19 +2535,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2505,7 +2555,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2513,7 +2563,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2521,7 +2571,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2529,7 +2579,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2559,7 +2609,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2758,12 +2808,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/gu.po b/po/gu.po
index c56d4db..03219fc 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -85,7 +85,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -245,9 +245,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -288,7 +288,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -298,13 +298,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -362,14 +362,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -677,14 +677,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -702,7 +702,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -764,13 +764,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -782,15 +782,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -806,7 +806,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -983,6 +983,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1021,7 +1031,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1029,7 +1039,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1089,13 +1099,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1109,7 +1119,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1179,7 +1189,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1193,7 +1203,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1261,6 +1271,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1389,7 +1403,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1836,7 +1850,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1890,7 +1904,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1954,7 +1968,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1984,10 +1998,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2022,7 +2032,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2064,7 +2074,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2112,38 +2122,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2171,14 +2181,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2200,7 +2210,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2214,7 +2224,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2242,7 +2280,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2287,11 +2325,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2303,7 +2353,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2311,7 +2361,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2323,7 +2373,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2358,11 +2408,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2372,7 +2422,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2424,11 +2474,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2440,7 +2490,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2456,7 +2506,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2465,7 +2515,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2475,7 +2525,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2484,19 +2534,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2504,7 +2554,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2512,7 +2562,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2520,7 +2570,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2528,7 +2578,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2558,7 +2608,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2757,12 +2807,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/hi.po b/po/hi.po
index f2f49e1..9de1e42 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -85,7 +85,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -245,9 +245,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -288,7 +288,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -298,13 +298,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -362,14 +362,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -677,14 +677,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -702,7 +702,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -764,13 +764,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -782,15 +782,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -806,7 +806,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -983,6 +983,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1021,7 +1031,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1029,7 +1039,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1089,13 +1099,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1109,7 +1119,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1179,7 +1189,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1193,7 +1203,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1261,6 +1271,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1389,7 +1403,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1836,7 +1850,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1890,7 +1904,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1954,7 +1968,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1984,10 +1998,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2022,7 +2032,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2064,7 +2074,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2112,38 +2122,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2171,14 +2181,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2200,7 +2210,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2214,7 +2224,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2242,7 +2280,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2287,11 +2325,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2303,7 +2353,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2311,7 +2361,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2323,7 +2373,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2358,11 +2408,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2372,7 +2422,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2424,11 +2474,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2440,7 +2490,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2456,7 +2506,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2465,7 +2515,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2475,7 +2525,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2484,19 +2534,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2504,7 +2554,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2512,7 +2562,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2520,7 +2570,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2528,7 +2578,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2558,7 +2608,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2757,12 +2807,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/kn.po b/po/kn.po
index 130a658..9a9cb93 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 01aadb2..136b648 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.31\n"
+"Project-Id-Version: libguestfs 1.27.32\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+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 (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -83,7 +83,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -93,7 +93,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -243,9 +243,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -286,7 +286,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -296,13 +296,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -323,7 +323,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -333,7 +333,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -360,14 +360,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -375,7 +375,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -393,7 +393,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -675,14 +675,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -700,7 +700,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -762,13 +762,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -780,15 +780,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -804,7 +804,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -832,7 +832,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -981,6 +981,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1019,7 +1029,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1027,7 +1037,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1087,13 +1097,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1107,7 +1117,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1177,7 +1187,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1191,7 +1201,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1259,6 +1269,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1387,7 +1401,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1834,7 +1848,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1888,7 +1902,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1952,7 +1966,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1982,10 +1996,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2020,7 +2030,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2062,7 +2072,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2110,38 +2120,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2169,14 +2179,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2198,7 +2208,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2212,7 +2222,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2240,7 +2278,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2285,11 +2323,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2301,7 +2351,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2309,7 +2359,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2321,7 +2371,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2356,11 +2406,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2370,7 +2420,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2422,11 +2472,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2438,7 +2488,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2454,7 +2504,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2463,7 +2513,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2473,7 +2523,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2482,19 +2532,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2502,7 +2552,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2510,7 +2560,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2518,7 +2568,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2526,7 +2576,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2556,7 +2606,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2755,12 +2805,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/ml.po b/po/ml.po
index 743c902..f2ccc3a 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/mr.po b/po/mr.po
index 9971f72..a0dcd82 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -85,7 +85,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -245,9 +245,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -288,7 +288,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -298,13 +298,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -362,14 +362,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -677,14 +677,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -702,7 +702,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -764,13 +764,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -782,15 +782,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -806,7 +806,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -983,6 +983,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1021,7 +1031,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1029,7 +1039,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1089,13 +1099,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1109,7 +1119,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1179,7 +1189,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1193,7 +1203,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1261,6 +1271,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1389,7 +1403,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1836,7 +1850,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1890,7 +1904,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1954,7 +1968,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1984,10 +1998,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2022,7 +2032,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2064,7 +2074,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2112,38 +2122,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2171,14 +2181,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2200,7 +2210,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2214,7 +2224,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2242,7 +2280,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2287,11 +2325,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2303,7 +2353,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2311,7 +2361,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2323,7 +2373,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2358,11 +2408,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2372,7 +2422,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2424,11 +2474,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2440,7 +2490,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2456,7 +2506,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2465,7 +2515,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2475,7 +2525,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2484,19 +2534,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2504,7 +2554,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2512,7 +2562,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2520,7 +2570,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2528,7 +2578,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2558,7 +2608,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2757,12 +2807,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/nl.po b/po/nl.po
index 66802bb..7665144 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -86,7 +86,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -246,9 +246,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -678,14 +678,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -703,7 +703,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -765,13 +765,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -783,15 +783,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -807,7 +807,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -984,6 +984,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1022,7 +1032,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1030,7 +1040,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1090,13 +1100,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1110,7 +1120,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1180,7 +1190,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1194,7 +1204,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1262,6 +1272,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1390,7 +1404,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1837,7 +1851,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1891,7 +1905,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1955,7 +1969,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1985,10 +1999,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2023,7 +2033,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2065,7 +2075,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2113,38 +2123,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2172,14 +2182,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2201,7 +2211,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2215,7 +2225,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2243,7 +2281,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2288,11 +2326,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2304,7 +2354,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2312,7 +2362,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2324,7 +2374,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2359,11 +2409,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2373,7 +2423,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2425,11 +2475,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2441,7 +2491,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2457,7 +2507,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2466,7 +2516,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2476,7 +2526,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2485,19 +2535,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2505,7 +2555,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2513,7 +2563,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2521,7 +2571,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2529,7 +2579,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2559,7 +2609,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2758,12 +2808,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/or.po b/po/or.po
index 640e1bb..a6e588c 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/pa.po b/po/pa.po
index f90dfbe..9a88959 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -85,7 +85,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -245,9 +245,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -288,7 +288,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -298,13 +298,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -362,14 +362,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -677,14 +677,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -702,7 +702,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -764,13 +764,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -782,15 +782,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -806,7 +806,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -983,6 +983,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1021,7 +1031,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1029,7 +1039,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1089,13 +1099,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1109,7 +1119,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1179,7 +1189,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1193,7 +1203,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1261,6 +1271,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1389,7 +1403,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1836,7 +1850,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1890,7 +1904,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1954,7 +1968,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1984,10 +1998,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2022,7 +2032,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2064,7 +2074,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2112,38 +2122,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2171,14 +2181,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2200,7 +2210,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2214,7 +2224,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2242,7 +2280,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2287,11 +2325,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2303,7 +2353,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2311,7 +2361,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2323,7 +2373,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2358,11 +2408,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2372,7 +2422,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2424,11 +2474,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2440,7 +2490,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2456,7 +2506,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2465,7 +2515,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2475,7 +2525,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2484,19 +2534,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2504,7 +2554,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2512,7 +2562,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2520,7 +2570,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2528,7 +2578,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2558,7 +2608,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2757,12 +2807,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/pl.po b/po/pl.po
index eaadd99..8b65357 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -88,7 +88,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -98,7 +98,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -248,9 +248,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -291,7 +291,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -301,13 +301,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -365,14 +365,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -398,7 +398,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -680,14 +680,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -705,7 +705,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -767,13 +767,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -785,15 +785,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -809,7 +809,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -837,7 +837,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -986,6 +986,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1024,7 +1034,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1032,7 +1042,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1092,13 +1102,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1112,7 +1122,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1182,7 +1192,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1196,7 +1206,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1264,6 +1274,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1392,7 +1406,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1839,7 +1853,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1893,7 +1907,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1957,7 +1971,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1987,10 +2001,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2025,7 +2035,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2067,7 +2077,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2115,38 +2125,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2174,14 +2184,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2203,7 +2213,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2217,7 +2227,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2245,7 +2283,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2290,11 +2328,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2306,7 +2356,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2314,7 +2364,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2326,7 +2376,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2361,11 +2411,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2375,7 +2425,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2427,11 +2477,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2443,7 +2493,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2459,7 +2509,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2468,7 +2518,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2478,7 +2528,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2487,19 +2537,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2507,7 +2557,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2515,7 +2565,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2523,7 +2573,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2531,7 +2581,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2561,7 +2611,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2760,12 +2810,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/ta.po b/po/ta.po
index 32283ba..e4bed04 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/te.po b/po/te.po
index ead8090..c221ae3 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -84,7 +84,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -244,9 +244,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -287,7 +287,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -297,13 +297,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -361,14 +361,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -676,14 +676,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -701,7 +701,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -763,13 +763,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -781,15 +781,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -805,7 +805,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -982,6 +982,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1020,7 +1030,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1028,7 +1038,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1088,13 +1098,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1108,7 +1118,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1178,7 +1188,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1192,7 +1202,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1260,6 +1270,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1388,7 +1402,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1835,7 +1849,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1889,7 +1903,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1953,7 +1967,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1983,10 +1997,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2021,7 +2031,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2063,7 +2073,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2111,38 +2121,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2170,14 +2180,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2199,7 +2209,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2213,7 +2223,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2241,7 +2279,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2286,11 +2324,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2302,7 +2352,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2310,7 +2360,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2322,7 +2372,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2357,11 +2407,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2371,7 +2421,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2423,11 +2473,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2439,7 +2489,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2455,7 +2505,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2464,7 +2514,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2474,7 +2524,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2483,19 +2533,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2503,7 +2553,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2511,7 +2561,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2519,7 +2569,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2527,7 +2577,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2557,7 +2607,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2756,12 +2806,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
diff --git a/po/uk.po b/po/uk.po
index 773041b..d22b432 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-08-24 21:20+0100\n"
+"POT-Creation-Date: 2014-08-28 21:59+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:176
+#: ../v2v/output_RHEV.ml:285
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
@@ -86,7 +86,7 @@ msgid ""
"you can also find this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/convert_linux.ml:1136
+#: ../v2v/convert_linux.ml:1142
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:180
+#: ../v2v/v2v.ml:199
msgid "%s: %s (ignored)"
msgstr ""
@@ -246,9 +246,9 @@ msgid ""
" virt-v2v -ic esx://esx.example.com/ -o rhev -os rhev.nfs:/export_domain --"
"network rhevm esx_guest\n"
"\n"
-" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
+" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
"\n"
-" virt-v2v -i disk -o local -os /tmp disk.img\n"
+" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:377 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:395 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:383 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:392 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:389 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:386 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:380 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -678,14 +678,14 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/output_libvirt.ml:239
+#: ../v2v/output_libvirt.ml:233
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:236
+#: ../v2v/output_libvirt.ml:230
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -703,7 +703,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirt.ml:171
+#: ../v2v/input_libvirtxml.ml:173
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -765,13 +765,13 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:254
+#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
"%!"
msgstr ""
-#: ../v2v/v2v.ml:184
+#: ../v2v/v2v.ml:203
msgid "Closing the overlay"
msgstr ""
@@ -783,15 +783,15 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:148
+#: ../v2v/v2v.ml:172
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:170
msgid "Converting the guest to run on KVM"
msgstr ""
-#: ../sparsify/copying.ml:309
+#: ../sparsify/copying.ml:305
msgid ""
"Copy to destination and make sparse ...\n"
"%!"
@@ -807,7 +807,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:222
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:229
+#: ../v2v/v2v.ml:257
msgid "Creating output metadata"
msgstr ""
@@ -984,6 +984,16 @@ msgstr ""
msgid "Dump POD for options (internal)"
msgstr ""
+#: ../v2v/input_libvirt.ml:70
+msgid ""
+"ESX: because of libvirt bug https://bugzilla.redhat.com/show_bug.cgi?"
+"id=1134592 you must set this environment variable:\n"
+"\n"
+"export LIBGUESTFS_BACKEND=direct\n"
+"\n"
+"and then rerun the virt-v2v command."
+msgstr ""
+
#: ../customize/customize_cmdline.ml:150
msgid "Edit file using Perl expression"
msgstr ""
@@ -1022,7 +1032,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1030,7 +1040,7 @@ msgstr ""
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../sparsify/copying.ml:188
+#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
"%!"
@@ -1090,13 +1100,13 @@ msgid ""
"The underlying error was: %s"
msgstr ""
-#: ../sparsify/copying.ml:238
+#: ../sparsify/copying.ml:234
msgid ""
"Fill free space in %s with zero ...\n"
"%!"
msgstr ""
-#: ../sparsify/copying.ml:288
+#: ../sparsify/copying.ml:284
msgid ""
"Fill free space in volgroup %s with zero ...\n"
"%!"
@@ -1110,7 +1120,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:232 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:260 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1180,7 +1190,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:133
+#: ../v2v/v2v.ml:145
msgid "Initializing the target %s"
msgstr ""
@@ -1194,7 +1204,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:139
+#: ../v2v/v2v.ml:163
msgid "Inspecting the overlay"
msgstr ""
@@ -1262,6 +1272,10 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
+#: ../v2v/v2v.ml:194
+msgid "Mapping filesystem data to avoid copying unused and blank areas"
+msgstr ""
+
#: ../builder/list_entries.ml:77
msgid "Minimum/default size:"
msgstr ""
@@ -1390,7 +1404,7 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:478 ../v2v/output_RHEV.ml:296
+#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1837,7 +1851,7 @@ msgstr ""
msgid "Sparsify in-place operation completed with no errors.\n"
msgstr ""
-#: ../sparsify/copying.ml:327
+#: ../sparsify/copying.ml:323
msgid ""
"Sparsify operation completed with no errors. Before deleting the old disk, "
"carefully check that the target disk boots and works correctly.\n"
@@ -1891,7 +1905,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1044
+#: ../v2v/convert_linux.ml:1050
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1955,7 +1969,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:702
+#: ../v2v/output_RHEV.ml:707
msgid ""
"This guest required a password for connection to its display, but this is "
"not supported by RHEV. Therefore the converted guest's display will not "
@@ -1985,10 +1999,6 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:175
-msgid "Trimming filesystems to reduce amount of data to copy"
-msgstr ""
-
#: ../resize/resize.ml:209
msgid "Turn off sparse copying"
msgstr ""
@@ -2023,7 +2033,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:603
+#: ../v2v/convert_linux.ml:609
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2065,7 +2075,7 @@ msgstr ""
msgid "Zero filesystem"
msgstr ""
-#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:228
+#: ../sparsify/in_place.ml:76 ../sparsify/copying.ml:224
msgid ""
"Zeroing %s ...\n"
"%!"
@@ -2113,38 +2123,38 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/output_libvirt.ml:277
+#: ../v2v/output_libvirt.ml:272
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
msgstr ""
-#: ../v2v/convert_windows.ml:394
+#: ../v2v/convert_windows.ml:393
msgid ""
"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows"
"\\CurrentVersion"
msgstr ""
-#: ../v2v/input_libvirt.ml:294
+#: ../v2v/input_libvirt.ml:52
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:154
+#: ../v2v/output_RHEV.ml:263
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:259
+#: ../v2v/output_libvirt.ml:254
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:991
+#: ../v2v/convert_linux.ml:997
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2172,14 +2182,14 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:254
+#: ../v2v/v2v.ml:155
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
-#: ../v2v/input_libvirt.ml:99
+#: ../v2v/input_libvirtxml.ml:101
msgid "display <graphics type='%s'> was ignored"
msgstr ""
@@ -2201,7 +2211,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:288
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2215,7 +2225,35 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_libvirt.ml:56
+#: ../v2v/lib_esx.ml:136
+msgid ""
+"esx: URI (-ic parameter) contains no path, so we cannot determine the "
+"datacenter name"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:194
+msgid "esx: URL not found: %s"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:214
+msgid ""
+"esx: could not read session cookie from the vCenter Server, conversion may "
+"consume all sessions on the server and fail part way through"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:189
+msgid "esx: incorrect username or password"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:199
+msgid "esx: invalid response from server"
+msgstr ""
+
+#: ../v2v/lib_esx.ml:184
+msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:51
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2243,7 +2281,7 @@ msgstr ""
msgid "external command '%s' stopped by signal %d"
msgstr ""
-#: ../sparsify/copying.ml:322
+#: ../sparsify/copying.ml:318
msgid "external command failed: %s"
msgstr ""
@@ -2288,11 +2326,23 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/input_libvirtxml.ml:64
+msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:66
+msgid "in the libvirt XML metadata, <name> is missing or empty"
+msgstr ""
+
+#: ../v2v/input_libvirtxml.ml:68
+msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:326
+#: ../v2v/v2v.ml:318
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 "
@@ -2304,7 +2354,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:131
+#: ../v2v/output_RHEV.ml:240
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2312,7 +2362,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:311
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2324,7 +2374,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/input_libvirt.ml:167
+#: ../v2v/input_libvirtxml.ml:169
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2359,11 +2409,11 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
-#: ../v2v/input_libvirt.ml:309
+#: ../v2v/input_libvirt.ml:80
msgid ""
"no support for remote libvirt connections to '-ic %s'. The conversion may "
"fail when it tries to read the source disks."
@@ -2373,7 +2423,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:718
+#: ../v2v/convert_linux.ml:724
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2425,11 +2475,11 @@ msgstr ""
msgid "pvresize"
msgstr ""
-#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:263
+#: ../sparsify/in_place.ml:113 ../sparsify/copying.ml:259
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:224 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:252 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2441,7 +2491,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2457,7 +2507,7 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/output_RHEV.ml:182
+#: ../v2v/output_RHEV.ml:291
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2466,7 +2516,7 @@ msgid ""
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:226
+#: ../v2v/output_RHEV.ml:335
msgid ""
"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
@@ -2476,7 +2526,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:288
+#: ../v2v/output_RHEV.ml:398
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2485,19 +2535,19 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:168
+#: ../v2v/output_RHEV.ml:277
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/output_RHEV.ml:166
+#: ../v2v/output_RHEV.ml:275
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
msgstr ""
-#: ../v2v/convert_windows.ml:253
+#: ../v2v/convert_windows.ml:252
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2505,7 +2555,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:263
+#: ../v2v/convert_windows.ml:262
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2513,7 +2563,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:280
+#: ../v2v/convert_windows.ml:279
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2521,7 +2571,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirt.ml:120
+#: ../v2v/input_libvirtxml.ml:122
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2529,7 +2579,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:847
+#: ../v2v/convert_linux.ml:853
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2559,7 +2609,7 @@ msgstr ""
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:426
+#: ../v2v/output_RHEV.ml:163
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2758,12 +2808,8 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:165
-msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
-msgstr ""
-
-#: ../v2v/v2v.ml:171
-msgid "virt-v2v is unable to convert this guest type (type=%s)"
+#: ../v2v/v2v.ml:186
+msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
#: ../sparsify/cmdline.ml:179
--
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