[Pkg-libvirt-commits] [libguestfs] 22/40: Version 1.27.43.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:44:45 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.44-1
in repository libguestfs.
commit 8f1ce3a72f5d05fe7b80904ab51803a2e137aebb
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Sep 11 19:38:10 2014 +0100
Version 1.27.43.
---
BUGS | 51 ++-
configure.ac | 2 +-
po-docs/ja.po | 754 ++++++++++++++++++++++----------------------
po-docs/libguestfs-docs.pot | 732 +++++++++++++++++++++---------------------
po-docs/uk.po | 752 +++++++++++++++++++++----------------------
po/en_GB.po | 194 +++++++-----
po/es.po | 194 +++++++-----
po/gu.po | 194 +++++++-----
po/hi.po | 194 +++++++-----
po/kn.po | 194 +++++++-----
po/libguestfs.pot | 196 +++++++-----
po/ml.po | 194 +++++++-----
po/mr.po | 194 +++++++-----
po/nl.po | 194 +++++++-----
po/or.po | 194 +++++++-----
po/pa.po | 194 +++++++-----
po/pl.po | 194 +++++++-----
po/ta.po | 194 +++++++-----
po/te.po | 194 +++++++-----
po/uk.po | 194 +++++++-----
20 files changed, 2857 insertions(+), 2346 deletions(-)
diff --git a/BUGS b/BUGS
index 56c3665..67e202a 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-09-10
+Last updated: 2014-09-11
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -353,9 +353,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1114012 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1114012
"yum install guestfish" on fresh Fedora 20 results in broken libguestfs
-1116942 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1116942
- RFE: virt-v2v should support converting to docker/lxc container images
-
1118305 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1118305
RFE: Ability to set iSCSI-Initiator-IQN for iSCSI connections
@@ -389,9 +386,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1136371 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1136371
add apt-rpm support to supermin
-1138231 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1138231
- Backing file '/root/rhel6.6-i386-hvm.img' of image '/tmp/v2vovlba582a.qcow2' is missing.
-
1138630 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1138630
Remove user accounts from "/etc/shadow" when exeucte virt-sysprep with '--enable user-account' option
@@ -401,15 +395,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1139785 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1139785
virt-sysprep should change UUID fields in /etc/sysconfig/network-scripts/ifcfg-* files
-1139973 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1139973
- Improve the error info when converting xen guest with no passwordless SSH access configured
-
-1140050 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1140050
- No error shows when multiple conflicting options used with virt-v2v
-
1140156 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1140156
RFE: Export to RHEV data domain
+1140547 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1140547
+ virt-builder option '--format' don't work well
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -434,10 +425,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1138619 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1138619
libguestfs-1.27.36-2.fc22: FTBFS with Perl 5.20
-1139543 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1139543
- Improve the error info when converting guest with no space left
-
-(139 bugs)
+(135 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -458,12 +446,6 @@ You can help by testing the fixes.
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
-1091856 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091856
- scrub-file can't handle link file
-
-1138504 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138504
- Support conversion of guests from remote kvm/xen/esx connections by virt-v2v
-
805417 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=805417
RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
@@ -473,10 +455,19 @@ You can help by testing the fixes.
1021149 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1021149
Rebase libguestfs to 1.28 in RHEL 7.1
-1136739 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1136739
- virt-v2v warning info should be printed to fill the whole line
+1091856 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1091856
+ scrub-file can't handle link file
+
+1138504 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1138504
+ Support conversion of guests from remote kvm/xen/esx connections by virt-v2v
+
+1139973 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1139973
+ Improve the error info when converting xen guest with no passwordless SSH access configured
-(11 bugs)
+1140050 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140050
+ No error shows when multiple conflicting options used with virt-v2v
+
+(12 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
@@ -526,6 +517,9 @@ These bugs are in the VERIFIED state.
1123794 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1123794
libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
+1136739 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1136739
+ virt-v2v warning info should be printed to fill the whole line
+
1138182 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138182
xen guest will be kernel panic after converted by virt-v2v
@@ -535,6 +529,9 @@ These bugs are in the VERIFIED state.
1138586 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138586
No error shows when converting running guest with virt-v2v
-(18 bugs)
+1139543 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1139543
+ Improve the error info when converting guest with no space left
+
+(20 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 162d62e..401d0e6 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], [42])
+m4_define([libguestfs_release], [43])
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 55544e0..afb4e37 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-10 22:08+0200\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -399,7 +399,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:136
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:137
msgid "OPTIONS"
msgstr "オプション"
@@ -419,7 +419,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:140
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:141
msgid "B<--help>"
msgstr "B<--help>"
@@ -723,7 +723,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:359
msgid "B<-q>"
msgstr "B<-q>"
@@ -731,7 +731,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:353
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:361
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -781,7 +781,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:441
msgid "B<-v>"
msgstr "B<-v>"
@@ -796,7 +796,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:443
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -808,7 +808,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:442
+#: ../v2v/virt-v2v.pod:445
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -827,7 +827,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../p2v/virt-p2v.pod:249 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:447
msgid "B<-V>"
msgstr "B<-V>"
@@ -847,7 +847,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod: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:446
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:449
msgid "B<--version>"
msgstr "B<--version>"
@@ -863,7 +863,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:448
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:451
msgid "Display version number and exit."
msgstr "バージョン番号を表示して、終了します。"
@@ -878,7 +878,7 @@ msgstr "バージョン番号を表示して、終了します。"
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:593 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:462
msgid "B<-x>"
msgstr "B<-x>"
@@ -891,7 +891,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:461
+#: ../v2v/virt-v2v.pod:464
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1401,9 +1401,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:367 ../v2v/virt-v2v.pod:371
-#: ../v2v/virt-v2v.pod:375 ../v2v/virt-v2v.pod:725 ../v2v/virt-v2v.pod:730
-#: ../v2v/virt-v2v.pod:735
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:421 ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:430 ../v2v/virt-v2v.pod:728 ../v2v/virt-v2v.pod:733
+#: ../v2v/virt-v2v.pod:738
msgid "*"
msgstr "*"
@@ -1485,7 +1485,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4748
#: ../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:960
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:963
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1525,7 +1525,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:781 ../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:975
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:978
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1556,7 +1556,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod: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:985
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:988
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1886,7 +1886,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:900
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1925,7 +1925,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4808
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:976
msgid "AUTHORS"
msgstr "著者"
@@ -1956,7 +1956,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:990
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2079,7 +2079,7 @@ msgstr ""
#: ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37
#: ../p2v/virt-p2v-make-disk.pod:31 ../resize/virt-resize.pod:25
#: ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:72
msgid "EXAMPLES"
msgstr "例"
@@ -2407,7 +2407,7 @@ msgstr ""
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:54 ../p2v/virt-p2v-make-kickstart.pod:138
#: ../p2v/virt-p2v.pod:236 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:142
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:143
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -2713,8 +2713,10 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:310
-msgid "B<--list --format> format"
-msgstr ""
+#, fuzzy
+#| msgid "B<--output-format> raw"
+msgid "B<--list --list-format> format"
+msgstr "B<--output-format> raw"
#. type: =item
#: ../builder/virt-builder.pod:312
@@ -2729,8 +2731,8 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:316
msgid ""
-"It is possible to choose with I<--format> the output format for the list "
-"templates:"
+"It is possible to choose with I<--list-format> the output format for the "
+"list templates:"
msgstr ""
#. type: =item
@@ -2790,13 +2792,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:210
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:211
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:212
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:213
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2894,8 +2896,8 @@ msgstr ""
#: ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29
#: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
#: ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091
-#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:746
-#: ../v2v/virt-v2v.pod:859
+#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:749
+#: ../v2v/virt-v2v.pod:862
msgid "1."
msgstr "1."
@@ -2914,8 +2916,8 @@ msgstr ""
#: ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42
#: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
#: ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095
-#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:760
-#: ../v2v/virt-v2v.pod:866
+#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:763
+#: ../v2v/virt-v2v.pod:869
msgid "2."
msgstr "2."
@@ -2933,8 +2935,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:768
-#: ../v2v/virt-v2v.pod:872
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:875
msgid "3."
msgstr "3."
@@ -2949,7 +2951,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:789
+#: ../v2v/virt-v2v.pod:792
msgid "4."
msgstr "4."
@@ -5364,7 +5366,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:834
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:837
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5399,7 +5401,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:849
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:852
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5448,7 +5450,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:920
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:923
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5462,7 +5464,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:925
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:928
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>)."
@@ -5470,13 +5472,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:928
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:931
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:932
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:935
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5491,7 +5493,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:939
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:942
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8629,7 +8631,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:958
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:961
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8769,7 +8771,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71
#: ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:883
+#: ../v2v/virt-v2v.pod:886
msgid "FILES"
msgstr "ファイル"
@@ -52119,7 +52121,7 @@ msgstr ""
"L<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:977
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:980
msgid "Matthew Booth"
msgstr ""
@@ -53706,7 +53708,7 @@ msgstr "デバッグメッセージを有効にします。"
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:149
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -54197,7 +54199,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:840
+#: ../v2v/virt-v2v.pod:843
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -54230,7 +54232,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:852
+#: ../v2v/virt-v2v.pod:855
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -54238,13 +54240,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:855
+#: ../v2v/virt-v2v.pod:858
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:861
+#: ../v2v/virt-v2v.pod:864
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -54252,7 +54254,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:864
+#: ../v2v/virt-v2v.pod:867
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -54263,7 +54265,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:868
+#: ../v2v/virt-v2v.pod:871
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54969,7 +54971,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:363
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -55152,7 +55154,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:903
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:906
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -55166,7 +55168,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:906
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:909
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 "
@@ -55174,7 +55176,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:910
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:913
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -55189,7 +55191,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:918
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:921
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87870,7 +87872,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
@@ -87879,7 +87881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:131
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
@@ -87887,7 +87889,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:121
#, fuzzy, no-wrap
#| msgid ""
#| " virt-rescue --ro -a /path/to/disk.img\n"
@@ -87900,7 +87902,7 @@ msgstr ""
"\n"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:112
#, fuzzy, no-wrap
#| msgid ""
#| " virt-rescue --ro -a /path/to/disk.img\n"
@@ -87949,13 +87951,13 @@ msgid ""
" ┌────────────┐\n"
" -i disk ───────────┐ │ │ ┌───────▶ -o local\n"
" -i ova ─────────┐ └──▶ │ virt-v2v │ │\n"
-" └────▶ │ conversion │ ──┘\n"
-" ESX ──▶┌────────────┐ │ server │ ┌────────────┐\n"
-" Xen ──▶│ -i libvirt ──▶ │ │ ───▶ -o libvirt │─▶ KVM\n"
-" ... ──▶│ (default) │ │ │ │ (default) │\n"
-" └────────────┘ │ │ ──┐└────────────┘\n"
-" -i libvirtxml ────────▶ │ │ ─┐└──────▶ -o glance\n"
-" └────────────┘ └─────────▶ -o rhev\n"
+" └────▶ │ conversion │ ──┘┌────────────┐\n"
+" ESX ──▶┌────────────┐ │ server │ ───▶ -o libvirt │─▶ KVM\n"
+" Xen ──▶│ -i libvirt ──▶ │ │ │ (default) │\n"
+" ... ──▶│ (default) │ │ │ ──┐└────────────┘\n"
+" └────────────┘ │ │ ─┐└──────▶ -o glance\n"
+" -i libvirtxml ────────▶ │ │ ┐└─────────▶ -o rhev\n"
+" └────────────┘ └──────────▶ -o vdsm\n"
"\n"
msgstr ""
@@ -88015,16 +88017,18 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:69
-msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgid ""
+"I<-o rhev> is used to write to a RHEV-M / oVirt target. I<-o vdsm> is only "
+"used when virt-v2v runs under VDSM control."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:74
msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:76
msgid ""
"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 "
@@ -88032,7 +88036,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:81
#, no-wrap
msgid ""
" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
@@ -88040,7 +88044,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:83
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</"
@@ -88048,17 +88052,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:87
msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:88
+#: ../v2v/virt-v2v.pod:89
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:91
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 "
@@ -88069,12 +88073,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:101
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:103
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 "
@@ -88082,49 +88086,49 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:107
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to OpenStack glance"
msgstr "空のディスクイメージを作成します"
#. type: textblock
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:109
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:114
#, fuzzy
#| msgid "To convert between formats, use the I<--convert> option:"
msgid "To control the name of the image in glance, use the I<-on> option."
msgstr "形式を変換するには I<--convert> オプションを使用します:"
#. type: =head2
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:116
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "空のディスクイメージを作成します"
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:118
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:122
+#: ../v2v/virt-v2v.pod:123
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:126
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 "
@@ -88133,47 +88137,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:132
+#: ../v2v/virt-v2v.pod:133
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:144
+#: ../v2v/virt-v2v.pod:145
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:147
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:151
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:154
+#: ../v2v/virt-v2v.pod:155
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i disk>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:159
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 "
@@ -88183,34 +88187,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:165
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:167
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:169
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:171
+#: ../v2v/virt-v2v.pod:172
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:173
+#: ../v2v/virt-v2v.pod:174
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:176
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 "
@@ -88219,33 +88223,33 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:180
+#: ../v2v/virt-v2v.pod:181
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:183
#, 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:184
+#: ../v2v/virt-v2v.pod:185
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i ova>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:187
msgid "Set the input method to I<ova>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:189
msgid ""
"In this mode you can read a VMware ova file. Virt-v2v will read the ova "
"manifest file and check the vmdk volumes for validity (checksums) as well "
@@ -88253,19 +88257,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:193
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:194
+#: ../v2v/virt-v2v.pod:195
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:197
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
"connections can be used. Other remote libvirt connections will not work in "
@@ -88273,7 +88277,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:202
#, fuzzy
#| msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
msgid ""
@@ -88282,47 +88286,47 @@ msgid ""
msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:204
+#: ../v2v/virt-v2v.pod:205
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:207
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:216
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:219
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:220
+#: ../v2v/virt-v2v.pod:221
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:223
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:225
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 "
@@ -88330,28 +88334,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:229
#, 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:230
+#: ../v2v/virt-v2v.pod:231
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:233
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:235
+#: ../v2v/virt-v2v.pod:236
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 "
@@ -88359,40 +88363,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:240
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:243
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:244
+#: ../v2v/virt-v2v.pod:245
#, fuzzy
#| msgid "B<-i>"
msgid "B<-o disk>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:247
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-o local>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:248
+#: ../v2v/virt-v2v.pod:249
#, fuzzy
#| msgid "B<-o kernel_cache>"
msgid "B<-o glance>"
msgstr "B<-o kernel_cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:250
+#: ../v2v/virt-v2v.pod:251
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
"is uploaded to Glance. You can control the image name by setting the I<-on> "
@@ -88400,41 +88404,41 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:255
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:259
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:261
+#: ../v2v/virt-v2v.pod:262
#, 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:263
+#: ../v2v/virt-v2v.pod:264
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:266
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:268
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 "
@@ -88442,7 +88446,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:272
#, no-wrap
msgid ""
" /dir/name-sda\n"
@@ -88452,12 +88456,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:276
msgid "and a libvirt XML file is created containing guest metadata:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:278
#, no-wrap
msgid ""
" /dir/name.xml\n"
@@ -88465,36 +88469,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:280
msgid "where C<name> is the guest name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:282
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o option>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:284
#, 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:285
+#: ../v2v/virt-v2v.pod:286
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:288
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:290
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 "
@@ -88503,97 +88507,116 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:295
+#, fuzzy
+#| msgid "B<-i>"
+msgid "B<-o vdsm>"
+msgstr "B<-i>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:297
+msgid "Set the output method to I<vdsm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:299
+msgid ""
+"This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
+"runs virt-v2v under VDSM control."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:302
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:304
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:306
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:308
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:310
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:305
+#: ../v2v/virt-v2v.pod:313
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:308
+#: ../v2v/virt-v2v.pod:316
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:318
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:320
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:322
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:324
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:319
+#: ../v2v/virt-v2v.pod:327
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:329
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:331
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:334
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:328
+#: ../v2v/virt-v2v.pod:336
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:331
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -88601,7 +88624,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:333
+#: ../v2v/virt-v2v.pod:341
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. "
@@ -88609,7 +88632,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:337
+#: ../v2v/virt-v2v.pod:345
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 "
@@ -88617,21 +88640,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:350
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:345
+#: ../v2v/virt-v2v.pod:353
#, fuzzy
#| msgid "B<--parts>"
msgid "B<--print-source>"
msgstr "B<--parts>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:347
+#: ../v2v/virt-v2v.pod:355
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 "
@@ -88639,105 +88662,37 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:357
-msgid "B<--rhev-image-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:359
-msgid "B<--rhev-vol-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:361
-#, fuzzy
-#| msgid "B<lvm-uuids> *"
-msgid "B<--rhev-vm-uuid> UUID"
-msgstr "B<lvm-uuids> *"
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:363
-msgid "Normally the RHEV output mode chooses a random UUID for each of:"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:369
-msgid "the image directory (I<--rhev-image-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:373
-msgid "once for each guest disk (I<--rhev-vol-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:377
-msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:381
-msgid "However you can force specific UUIDs instead by using these options."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:383
-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:386
-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:390
-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:393
-msgid "These options can only be used with I<-o rhev>."
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:365
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:367
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:399
+#: ../v2v/virt-v2v.pod:369
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:371
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:373
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:375
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:377
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 "
@@ -88748,14 +88703,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:385
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:418
+#: ../v2v/virt-v2v.pod:388
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 "
@@ -88764,7 +88719,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:393
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 "
@@ -88772,7 +88727,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:397
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 "
@@ -88781,7 +88736,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:432
+#: ../v2v/virt-v2v.pod:402
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 "
@@ -88791,32 +88746,91 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:408
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-image-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:410
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-vol-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:412
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-vm-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:414
+msgid ""
+"Normally the RHEV output mode chooses random UUIDs for the target guest. "
+"However VDSM needs to control the UUIDs and passes these parameters when "
+"virt-v2v runs under VDSM control. The parameters control:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:423
+msgid "the image directory (I<--vdsm-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:427
+msgid ""
+"UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
+"for each guest disk)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:432
+msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:436
+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:439
+msgid "These options can only be used with I<-o vdsm>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:453
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:455
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:457
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 "
-"default is chosen based on the detected guest operating system."
+"For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest. "
+"You can set this to C<desktop> or C<server>. If the option is not given, "
+"then a suitable default is chosen based on the detected guest operating "
+"system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:468
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:470
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 "
@@ -88825,7 +88839,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:475
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -88833,7 +88847,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -88841,7 +88855,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -88854,7 +88868,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:488
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -88863,7 +88877,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88875,7 +88889,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:494
+#: ../v2v/virt-v2v.pod:497
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88884,7 +88898,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:500
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88892,19 +88906,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:502
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:504
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:504
+#: ../v2v/virt-v2v.pod:507
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 "
@@ -88912,7 +88926,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:512
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 "
@@ -88920,7 +88934,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:517
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88928,7 +88942,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:519
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88936,7 +88950,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:521
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88946,7 +88960,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:522
+#: ../v2v/virt-v2v.pod:525
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88954,7 +88968,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88962,7 +88976,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:529
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88970,7 +88984,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:531
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88978,7 +88992,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88986,7 +89000,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:535
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88994,7 +89008,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:534
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -89003,12 +89017,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:540
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:542
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 "
@@ -89016,7 +89030,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:547
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 "
@@ -89026,14 +89040,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:550
+#: ../v2v/virt-v2v.pod:553
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:553
+#: ../v2v/virt-v2v.pod:556
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -89044,21 +89058,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:561
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:561
+#: ../v2v/virt-v2v.pod:564
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:564
+#: ../v2v/virt-v2v.pod:567
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -89066,12 +89080,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:569
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:568
+#: ../v2v/virt-v2v.pod:571
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -89079,14 +89093,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:573
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:573
+#: ../v2v/virt-v2v.pod:576
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -89097,7 +89111,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -89105,23 +89119,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:583
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:585
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:587
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:587
+#: ../v2v/virt-v2v.pod:590
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 "
@@ -89129,12 +89143,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:591
+#: ../v2v/virt-v2v.pod:594
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:593
+#: ../v2v/virt-v2v.pod:596
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -89142,7 +89156,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:595
+#: ../v2v/virt-v2v.pod:598
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 "
@@ -89151,25 +89165,25 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:603
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:602
+#: ../v2v/virt-v2v.pod:605
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:607
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:610
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -89178,7 +89192,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:613
#, no-wrap
msgid ""
" Id Name State\n"
@@ -89189,7 +89203,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:615
+#: ../v2v/virt-v2v.pod:618
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 "
@@ -89198,7 +89212,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:623
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -89206,14 +89220,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622 ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:625 ../v2v/virt-v2v.pod:693
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:628
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -89225,7 +89239,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:631
+#: ../v2v/virt-v2v.pod:634
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 "
@@ -89233,17 +89247,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:638
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:637
+#: ../v2v/virt-v2v.pod:640
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -89253,13 +89267,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:646
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:649
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -89267,7 +89281,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650 ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:653 ../v2v/virt-v2v.pod:717
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 "
@@ -89275,17 +89289,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:657
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:659
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:661
msgid ""
"Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
"input mode should be I<-i libvirt>. As this is the default, you don't need "
@@ -89293,33 +89307,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:662
+#: ../v2v/virt-v2v.pod:665
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:667
msgid ""
"Currently you must enable passwordless SSH access to the remote Xen host "
"from the virt-v2v conversion server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667
+#: ../v2v/virt-v2v.pod:670
msgid ""
"You must also use ssh-agent, and add your ssh public key to C</root/.ssh/"
"authorized_keys> (on the Xen host)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:673
msgid ""
"After doing this, you should check that passwordless access works from the "
"virt-v2v server to the Xen host. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:676
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -89328,19 +89342,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:679
msgid ""
"Note that password-interactive and Kerberos access are B<not> supported. "
"You B<have> to set up ssh access using ssh-agent and authorized_keys."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:680
+#: ../v2v/virt-v2v.pod:683
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:685
#, fuzzy
#| msgid "Use L<virt-filesystems(1)> to list the filesystems in the guest."
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
@@ -89349,7 +89363,7 @@ msgstr ""
"使用します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:684
+#: ../v2v/virt-v2v.pod:687
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -89361,7 +89375,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -89373,7 +89387,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:699
+#: ../v2v/virt-v2v.pod:702
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration or the remote server before "
@@ -89381,17 +89395,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:706
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:705
+#: ../v2v/virt-v2v.pod:708
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:707
+#: ../v2v/virt-v2v.pod:710
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -89401,58 +89415,58 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:711
+#: ../v2v/virt-v2v.pod:714
msgid ""
"where C<rhel49-x86_64-pv> is the name of the guest (which must be shut down)."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:721
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:720
+#: ../v2v/virt-v2v.pod:723
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:727
+#: ../v2v/virt-v2v.pod:730
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:735
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:737
+#: ../v2v/virt-v2v.pod:740
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:741
+#: ../v2v/virt-v2v.pod:744
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:748
+#: ../v2v/virt-v2v.pod:751
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:751
+#: ../v2v/virt-v2v.pod:754
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -89460,14 +89474,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:756
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:755
+#: ../v2v/virt-v2v.pod:758
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -89476,17 +89490,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:758
+#: ../v2v/virt-v2v.pod:761
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:762
+#: ../v2v/virt-v2v.pod:765
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:764
+#: ../v2v/virt-v2v.pod:767
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -89496,14 +89510,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:770
+#: ../v2v/virt-v2v.pod:773
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:773
+#: ../v2v/virt-v2v.pod:776
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -89515,7 +89529,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:779
+#: ../v2v/virt-v2v.pod:782
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 "
@@ -89523,7 +89537,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:783
+#: ../v2v/virt-v2v.pod:786
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -89535,12 +89549,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:791
+#: ../v2v/virt-v2v.pod:794
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:793
+#: ../v2v/virt-v2v.pod:796
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -89548,19 +89562,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:800
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:799
+#: ../v2v/virt-v2v.pod:802
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:803
+#: ../v2v/virt-v2v.pod:806
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 "
@@ -89568,7 +89582,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:807
+#: ../v2v/virt-v2v.pod:810
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -89601,7 +89615,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:839
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 "
@@ -89609,14 +89623,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:845
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:845
+#: ../v2v/virt-v2v.pod:848
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -89626,7 +89640,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:874
+#: ../v2v/virt-v2v.pod:877
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 "
@@ -89634,36 +89648,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:880
+#: ../v2v/virt-v2v.pod:883
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:887
+#: ../v2v/virt-v2v.pod:890
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:889 ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:892 ../v2v/virt-v2v.pod:946
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:891
+#: ../v2v/virt-v2v.pod:894
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:901
+#: ../v2v/virt-v2v.pod:904
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:912
+#: ../v2v/virt-v2v.pod:915
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 "
@@ -89673,31 +89687,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:922
+#: ../v2v/virt-v2v.pod:925
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:934
+#: ../v2v/virt-v2v.pod:937
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:939
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:941
+#: ../v2v/virt-v2v.pod:944
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:945
+#: ../v2v/virt-v2v.pod:948
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. "
@@ -89707,14 +89721,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:951
+#: ../v2v/virt-v2v.pod:954
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:965
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
@@ -89728,17 +89742,17 @@ msgstr ""
"L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:982
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:981
+#: ../v2v/virt-v2v.pod:984
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:986
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 5f8112b..39cfb7b 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.42\n"
+"Project-Id-Version: libguestfs 1.27.43\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-10 22:08+0200\n"
+"POT-Creation-Date: 2014-09-11 19:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -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:511 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:351
+#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:359
msgid "B<-q>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:353
+#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:361
msgid "B<--quiet>"
msgstr ""
@@ -458,42 +458,42 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245 ../res [...]
msgid "B<--verbose>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:442
+#: ../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:445
msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:67 ../p2v/virt-p2v-make-kickstart.pod:155 [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:67 ../p2v/virt-p2v-make-kickstart.pod:155 [...]
msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
msgid "B<-x>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod: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:595 ../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-make-disk.pod:111 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:111 ../p2v/vi [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:91 ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:897
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:91 ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:900
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/virt-p2v-make-disk.pod:115 ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v/virt-p2v-make-disk.pod:115 ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814 ../test-tool/libguestfs-test-tool.pod [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1268,7 +1268,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:49 ../cat/virt-cat.pod:30 ../cat/virt-log.pod:24 ../cat/virt-ls.pod:33 ../df/virt-df.pod:45 ../edit/virt-edit.pod:42 ../fish/guestfish.pod:39 ../fish/guestfish.pod:1097 ../fish/virt-copy-in.pod:27 ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28 ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37 ../p2v/virt-p2v-make-disk.pod:31 ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47 ../v2v/virt-v2v.pod:71
+#: ../builder/virt-builder.pod:49 ../cat/virt-cat.pod:30 ../cat/virt-log.pod:24 ../cat/virt-ls.pod:33 ../df/virt-df.pod:45 ../edit/virt-edit.pod:42 ../fish/guestfish.pod:39 ../fish/guestfish.pod:1097 ../fish/virt-copy-in.pod:27 ../fish/virt-copy-out.pod:19 ../fish/virt-tar-in.pod:28 ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37 ../p2v/virt-p2v-make-disk.pod:31 ../resize/virt-resize.pod:25 ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47 ../v2v/virt-v2v.pod:72
msgid "EXAMPLES"
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-make-disk.pod:54 ../p2v/virt-p2v-make-kickstart.pod:138 ../p2v/virt-p2v.pod:236 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:142
+#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v-make-disk.pod:54 ../p2v/virt-p2v-make-kickstart.pod:138 ../p2v/virt-p2v.pod:236 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:143
msgid "Display help."
msgstr ""
@@ -1893,7 +1893,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:310
-msgid "B<--list --format> format"
+msgid "B<--list --list-format> format"
msgstr ""
#. type: =item
@@ -1909,8 +1909,8 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:316
msgid ""
-"It is possible to choose with I<--format> the output format for the list "
-"templates:"
+"It is possible to choose with I<--list-format> the output format for the "
+"list templates:"
msgstr ""
#. type: =item
@@ -1969,12 +1969,12 @@ msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:210
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:211
msgid "B<--machine-readable>"
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:212
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:213
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:485 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:485 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs. [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:490 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:490 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs. [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:496 ../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:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:768 ../v2v/virt-v2v.pod:872
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:496 ../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:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:771 ../v2v/virt-v2v.pod:875
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:789
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:792
msgid "4."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:834
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:837
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -4539,7 +4539,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:849
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:852
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:920
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:923
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:925
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:928
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:928
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:931
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:932
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:935
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:939
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:942
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:958
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:961
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 ../p2v/virt-p2v-make-disk.pod:71 ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:883
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71 ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:886
msgid "FILES"
msgstr ""
@@ -47717,7 +47717,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:977
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:980
msgid "Matthew Booth"
msgstr ""
@@ -49168,7 +49168,7 @@ msgid "Enable debugging messages."
msgstr ""
#. type: =item
-#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:148
+#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:149
msgid "B<--debug-gc>"
msgstr ""
@@ -49621,7 +49621,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:840
+#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:843
msgid "There are two ways to use this option."
msgstr ""
@@ -49646,26 +49646,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:852
+#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:855
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:855
+#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:858
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:861
+#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:864
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
msgstr ""
#. type: verbatim
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:864
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:867
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -49673,7 +49673,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:868
+#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:871
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -50316,7 +50316,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:363
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -50489,7 +50489,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:903
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:906
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -50503,7 +50503,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:906
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:909
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 "
@@ -50511,7 +50511,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:910
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:913
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50526,7 +50526,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:918
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:921
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78589,7 +78589,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
@@ -78598,7 +78598,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:131
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
@@ -78606,7 +78606,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:121
#, no-wrap
msgid ""
" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
@@ -78614,7 +78614,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:112
#, no-wrap
msgid ""
" virt-v2v -i disk disk.img -o glance\n"
@@ -78656,13 +78656,13 @@ msgid ""
" ┌────────────┐\n"
" -i disk ───────────┐ │ │ ┌───────▶ -o local\n"
" -i ova ─────────┐ └──▶ │ virt-v2v │ │\n"
-" └────▶ │ conversion │ ──┘\n"
-" ESX ──▶┌────────────┐ │ server │ ┌────────────┐\n"
-" Xen ──▶│ -i libvirt ──▶ │ │ ───▶ -o libvirt │─▶ KVM\n"
-" ... ──▶│ (default) │ │ │ │ (default) │\n"
-" └────────────┘ │ │ ──┐└────────────┘\n"
-" -i libvirtxml ────────▶ │ │ ─┐└──────▶ -o glance\n"
-" └────────────┘ └─────────▶ -o rhev\n"
+" └────▶ │ conversion │ ──┘┌────────────┐\n"
+" ESX ──▶┌────────────┐ │ server │ ───▶ -o libvirt │─▶ KVM\n"
+" Xen ──▶│ -i libvirt ──▶ │ │ │ (default) │\n"
+" ... ──▶│ (default) │ │ │ ──┐└────────────┘\n"
+" └────────────┘ │ │ ─┐└──────▶ -o glance\n"
+" -i libvirtxml ────────▶ │ │ ┐└─────────▶ -o rhev\n"
+" └────────────┘ └──────────▶ -o vdsm\n"
"\n"
msgstr ""
@@ -78720,16 +78720,18 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:69
-msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgid ""
+"I<-o rhev> is used to write to a RHEV-M / oVirt target. I<-o vdsm> is only "
+"used when virt-v2v runs under VDSM control."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:74
msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:76
msgid ""
"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 "
@@ -78737,7 +78739,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:81
#, no-wrap
msgid ""
" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
@@ -78745,7 +78747,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:83
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 "
@@ -78753,17 +78755,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:87
msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:88
+#: ../v2v/virt-v2v.pod:89
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:91
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 "
@@ -78774,12 +78776,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:101
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:103
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 "
@@ -78787,43 +78789,43 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:107
msgid "Convert disk image to OpenStack glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:109
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:114
msgid "To control the name of the image in glance, use the I<-on> option."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:116
msgid "Convert disk image to disk image"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:118
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:122
+#: ../v2v/virt-v2v.pod:123
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:126
msgid ""
"A more complex method is to write some L<libvirt "
"XML|http://libvirt.org/formatdomain.html> describing the input guest (if you "
@@ -78832,41 +78834,41 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:132
+#: ../v2v/virt-v2v.pod:133
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:144
+#: ../v2v/virt-v2v.pod:145
msgid "B<--bridge> ..."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:147
msgid "See I<--network> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:151
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:154
+#: ../v2v/virt-v2v.pod:155
msgid "B<-i disk>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:159
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 "
@@ -78876,34 +78878,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:165
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:167
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:169
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:171
+#: ../v2v/virt-v2v.pod:172
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:173
+#: ../v2v/virt-v2v.pod:174
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:176
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 "
@@ -78912,27 +78914,27 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:180
+#: ../v2v/virt-v2v.pod:181
msgid "B<-i local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:183
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:185
msgid "B<-i ova>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:187
msgid "Set the input method to I<ova>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:189
msgid ""
"In this mode you can read a VMware ova file. Virt-v2v will read the ova "
"manifest file and check the vmdk volumes for validity (checksums) as well "
@@ -78940,19 +78942,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:193
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:194
+#: ../v2v/virt-v2v.pod:195
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:197
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
"connections can be used. Other remote libvirt connections will not work in "
@@ -78960,46 +78962,46 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:202
msgid ""
"See also L</INPUT FROM VMWARE VCENTER SERVER>, L</INPUT FROM RHEL 5 XEN> "
"below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:204
+#: ../v2v/virt-v2v.pod:205
msgid "B<-if> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:207
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:216
+#: ../v2v/virt-v2v.pod:217
msgid "B<--network> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:219
msgid "B<--network> out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:220
+#: ../v2v/virt-v2v.pod:221
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:223
msgid "B<--bridge> out"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:225
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 "
@@ -79007,24 +79009,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:229
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:230
+#: ../v2v/virt-v2v.pod:231
msgid "B<--no-copy>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:233
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:235
+#: ../v2v/virt-v2v.pod:236
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 "
@@ -79032,34 +79034,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:240
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:243
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:244
+#: ../v2v/virt-v2v.pod:245
msgid "B<-o disk>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:247
msgid "This is the same as I<-o local>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:248
+#: ../v2v/virt-v2v.pod:249
msgid "B<-o glance>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:250
+#: ../v2v/virt-v2v.pod:251
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
"is uploaded to Glance. You can control the image name by setting the I<-on> "
@@ -79067,39 +79069,39 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:255
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:259
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:261
+#: ../v2v/virt-v2v.pod:262
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:263
+#: ../v2v/virt-v2v.pod:264
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:266
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:268
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 "
@@ -79107,7 +79109,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:272
#, no-wrap
msgid ""
" /dir/name-sda\n"
@@ -79117,12 +79119,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:276
msgid "and a libvirt XML file is created containing guest metadata:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:278
#, no-wrap
msgid ""
" /dir/name.xml\n"
@@ -79130,32 +79132,32 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:280
msgid "where C<name> is the guest name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:282
msgid "B<-o ovirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:284
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:286
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:288
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:290
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 "
@@ -79164,97 +79166,114 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:295
+msgid "B<-o vdsm>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:297
+msgid "Set the output method to I<vdsm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:299
+msgid ""
+"This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
+"runs virt-v2v under VDSM control."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:302
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:304
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:306
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:308
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:310
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:305
+#: ../v2v/virt-v2v.pod:313
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:308
+#: ../v2v/virt-v2v.pod:316
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:318
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:320
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:322
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:324
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:319
+#: ../v2v/virt-v2v.pod:327
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:329
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:331
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
"pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:334
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:328
+#: ../v2v/virt-v2v.pod:336
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:331
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -79262,7 +79281,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:333
+#: ../v2v/virt-v2v.pod:341
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. "
@@ -79270,7 +79289,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:337
+#: ../v2v/virt-v2v.pod:345
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 "
@@ -79278,19 +79297,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:350
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:345
+#: ../v2v/virt-v2v.pod:353
msgid "B<--print-source>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:347
+#: ../v2v/virt-v2v.pod:355
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 "
@@ -79298,103 +79317,37 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:357
-msgid "B<--rhev-image-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:359
-msgid "B<--rhev-vol-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:361
-msgid "B<--rhev-vm-uuid> UUID"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:363
-msgid "Normally the RHEV output mode chooses a random UUID for each of:"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:369
-msgid "the image directory (I<--rhev-image-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:373
-msgid "once for each guest disk (I<--rhev-vol-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:377
-msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:381
-msgid "However you can force specific UUIDs instead by using these options."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:383
-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:386
-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:390
-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:393
-msgid "These options can only be used with I<-o rhev>."
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:365
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:367
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:399
+#: ../v2v/virt-v2v.pod:369
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:371
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:373
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:375
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:377
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 "
@@ -79405,14 +79358,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:385
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:418
+#: ../v2v/virt-v2v.pod:388
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 "
@@ -79421,7 +79374,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:393
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 "
@@ -79429,7 +79382,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:397
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 "
@@ -79438,7 +79391,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:432
+#: ../v2v/virt-v2v.pod:402
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 "
@@ -79448,30 +79401,83 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:408
+msgid "B<--vdsm-image-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:410
+msgid "B<--vdsm-vol-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:412
+msgid "B<--vdsm-vm-uuid> UUID"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:414
+msgid ""
+"Normally the RHEV output mode chooses random UUIDs for the target guest. "
+"However VDSM needs to control the UUIDs and passes these parameters when "
+"virt-v2v runs under VDSM control. The parameters control:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:423
+msgid "the image directory (I<--vdsm-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:427
+msgid ""
+"UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
+"for each guest disk)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:432
+msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:436
+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:439
+msgid "These options can only be used with I<-o vdsm>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:453
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:455
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:457
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 "
-"default is chosen based on the detected guest operating system."
+"For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest. "
+"You can set this to C<desktop> or C<server>. If the option is not given, "
+"then a suitable default is chosen based on the detected guest operating "
+"system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:468
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:470
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 "
@@ -79480,7 +79486,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:475
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -79488,7 +79494,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -79496,7 +79502,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -79509,7 +79515,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:488
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -79518,7 +79524,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -79530,7 +79536,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:494
+#: ../v2v/virt-v2v.pod:497
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -79539,7 +79545,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:500
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -79547,19 +79553,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:502
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:504
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:504
+#: ../v2v/virt-v2v.pod:507
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 "
@@ -79567,7 +79573,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:512
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 "
@@ -79575,7 +79581,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:517
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -79583,7 +79589,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:519
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -79591,7 +79597,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:521
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -79601,7 +79607,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:522
+#: ../v2v/virt-v2v.pod:525
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -79609,7 +79615,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -79617,7 +79623,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:529
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -79625,7 +79631,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:531
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -79633,7 +79639,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -79641,7 +79647,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:535
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -79649,7 +79655,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:534
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -79658,12 +79664,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:540
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:542
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 "
@@ -79671,7 +79677,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:547
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 "
@@ -79681,14 +79687,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:550
+#: ../v2v/virt-v2v.pod:553
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:553
+#: ../v2v/virt-v2v.pod:556
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79699,21 +79705,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:561
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:561
+#: ../v2v/virt-v2v.pod:564
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:564
+#: ../v2v/virt-v2v.pod:567
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -79721,12 +79727,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:569
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:568
+#: ../v2v/virt-v2v.pod:571
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -79734,14 +79740,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:573
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:573
+#: ../v2v/virt-v2v.pod:576
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79752,7 +79758,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -79760,22 +79766,22 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:583
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:585
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:587
msgid "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:587
+#: ../v2v/virt-v2v.pod:590
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 "
@@ -79783,12 +79789,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:591
+#: ../v2v/virt-v2v.pod:594
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:593
+#: ../v2v/virt-v2v.pod:596
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -79796,7 +79802,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:595
+#: ../v2v/virt-v2v.pod:598
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 "
@@ -79805,24 +79811,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:603
msgid "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:602
+#: ../v2v/virt-v2v.pod:605
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:607
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:610
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -79831,7 +79837,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:613
#, no-wrap
msgid ""
" Id Name State\n"
@@ -79842,7 +79848,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:615
+#: ../v2v/virt-v2v.pod:618
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 "
@@ -79851,7 +79857,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:623
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list "
@@ -79860,14 +79866,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622 ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:625 ../v2v/virt-v2v.pod:693
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:628
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows "
@@ -79880,7 +79886,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:631
+#: ../v2v/virt-v2v.pod:634
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 "
@@ -79888,17 +79894,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:638
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:637
+#: ../v2v/virt-v2v.pod:640
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' "
@@ -79909,12 +79915,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:646
msgid "where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:649
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -79922,7 +79928,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650 ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:653 ../v2v/virt-v2v.pod:717
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 "
@@ -79930,17 +79936,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:657
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:659
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:661
msgid ""
"Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
"input mode should be I<-i libvirt>. As this is the default, you don't need "
@@ -79948,33 +79954,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:662
+#: ../v2v/virt-v2v.pod:665
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:667
msgid ""
"Currently you must enable passwordless SSH access to the remote Xen host "
"from the virt-v2v conversion server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667
+#: ../v2v/virt-v2v.pod:670
msgid ""
"You must also use ssh-agent, and add your ssh public key to "
"C</root/.ssh/authorized_keys> (on the Xen host)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:673
msgid ""
"After doing this, you should check that passwordless access works from the "
"virt-v2v server to the Xen host. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:676
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -79983,24 +79989,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:679
msgid ""
"Note that password-interactive and Kerberos access are B<not> supported. "
"You B<have> to set up ssh access using ssh-agent and authorized_keys."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:680
+#: ../v2v/virt-v2v.pod:683
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:685
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:684
+#: ../v2v/virt-v2v.pod:687
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -80012,7 +80018,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -80024,7 +80030,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:699
+#: ../v2v/virt-v2v.pod:702
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration or the remote server before "
@@ -80032,17 +80038,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:706
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:705
+#: ../v2v/virt-v2v.pod:708
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:707
+#: ../v2v/virt-v2v.pod:710
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -80052,59 +80058,59 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:711
+#: ../v2v/virt-v2v.pod:714
msgid ""
"where C<rhel49-x86_64-pv> is the name of the guest (which must be shut "
"down)."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:721
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:720
+#: ../v2v/virt-v2v.pod:723
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:727
+#: ../v2v/virt-v2v.pod:730
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:735
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:737
+#: ../v2v/virt-v2v.pod:740
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:741
+#: ../v2v/virt-v2v.pod:744
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:748
+#: ../v2v/virt-v2v.pod:751
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:751
+#: ../v2v/virt-v2v.pod:754
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -80112,12 +80118,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:756
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:755
+#: ../v2v/virt-v2v.pod:758
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -80126,17 +80132,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:758
+#: ../v2v/virt-v2v.pod:761
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:762
+#: ../v2v/virt-v2v.pod:765
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:764
+#: ../v2v/virt-v2v.pod:767
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -80146,14 +80152,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:770
+#: ../v2v/virt-v2v.pod:773
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:773
+#: ../v2v/virt-v2v.pod:776
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -80165,7 +80171,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:779
+#: ../v2v/virt-v2v.pod:782
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 "
@@ -80173,7 +80179,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:783
+#: ../v2v/virt-v2v.pod:786
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -80185,12 +80191,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:791
+#: ../v2v/virt-v2v.pod:794
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:793
+#: ../v2v/virt-v2v.pod:796
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -80198,19 +80204,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:800
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:799
+#: ../v2v/virt-v2v.pod:802
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:803
+#: ../v2v/virt-v2v.pod:806
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 "
@@ -80218,7 +80224,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:807
+#: ../v2v/virt-v2v.pod:810
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -80251,7 +80257,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:839
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 "
@@ -80259,14 +80265,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:845
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:845
+#: ../v2v/virt-v2v.pod:848
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -80276,7 +80282,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:874
+#: ../v2v/virt-v2v.pod:877
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 "
@@ -80284,36 +80290,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:880
+#: ../v2v/virt-v2v.pod:883
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:887
+#: ../v2v/virt-v2v.pod:890
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:889 ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:892 ../v2v/virt-v2v.pod:946
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:891
+#: ../v2v/virt-v2v.pod:894
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:901
+#: ../v2v/virt-v2v.pod:904
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:912
+#: ../v2v/virt-v2v.pod:915
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 "
@@ -80323,31 +80329,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:922
+#: ../v2v/virt-v2v.pod:925
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:934
+#: ../v2v/virt-v2v.pod:937
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:939
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:941
+#: ../v2v/virt-v2v.pod:944
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:945
+#: ../v2v/virt-v2v.pod:948
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. "
@@ -80357,14 +80363,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:951
+#: ../v2v/virt-v2v.pod:954
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:965
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)>, "
@@ -80372,16 +80378,16 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:982
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:981
+#: ../v2v/virt-v2v.pod:984
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:986
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 72af815..f7a15ac 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-10 22:08+0200\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -401,7 +401,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:136
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:137
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
@@ -421,7 +421,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:140
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:141
msgid "B<--help>"
msgstr "B<--help>"
@@ -736,7 +736,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:511
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:359
msgid "B<-q>"
msgstr "B<-q>"
@@ -744,7 +744,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:513 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:353
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:361
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -794,7 +794,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:243
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:438
+#: ../v2v/virt-v2v.pod:441
msgid "B<-v>"
msgstr "B<-v>"
@@ -809,7 +809,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:245
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:443
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -821,7 +821,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:442
+#: ../v2v/virt-v2v.pod:445
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -840,7 +840,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../p2v/virt-p2v.pod:249 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:447
msgid "B<-V>"
msgstr "B<-V>"
@@ -860,7 +860,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod: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:446
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:449
msgid "B<--version>"
msgstr "B<--version>"
@@ -876,7 +876,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:448
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:451
msgid "Display version number and exit."
msgstr "Показати дані щодо версії і завершити роботу."
@@ -891,7 +891,7 @@ msgstr "Показати дані щодо версії і завершити р
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:593 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:462
msgid "B<-x>"
msgstr "B<-x>"
@@ -904,7 +904,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:595
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:461
+#: ../v2v/virt-v2v.pod:464
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1375,9 +1375,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:367 ../v2v/virt-v2v.pod:371
-#: ../v2v/virt-v2v.pod:375 ../v2v/virt-v2v.pod:725 ../v2v/virt-v2v.pod:730
-#: ../v2v/virt-v2v.pod:735
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:421 ../v2v/virt-v2v.pod:425
+#: ../v2v/virt-v2v.pod:430 ../v2v/virt-v2v.pod:728 ../v2v/virt-v2v.pod:733
+#: ../v2v/virt-v2v.pod:738
msgid "*"
msgstr "*"
@@ -1455,7 +1455,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4748
#: ../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:960
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:963
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1495,7 +1495,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:781 ../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:975
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:978
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1526,7 +1526,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod: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:985
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:988
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1843,7 +1843,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:175 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4640
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:900
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1882,7 +1882,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4808
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:976
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1913,7 +1913,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:201 ../p2v/virt-p2v.pod:273
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4814
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:990
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2049,7 +2049,7 @@ msgstr ""
#: ../fish/virt-tar-out.pod:22 ../fuse/guestmount.pod:37
#: ../p2v/virt-p2v-make-disk.pod:31 ../resize/virt-resize.pod:25
#: ../sparsify/virt-sparsify.pod:85 ../tools/virt-tar:47
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:72
msgid "EXAMPLES"
msgstr "ПРИКЛАДИ"
@@ -2411,7 +2411,7 @@ msgstr ""
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:54 ../p2v/virt-p2v-make-kickstart.pod:138
#: ../p2v/virt-p2v.pod:236 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:142
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:143
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -2724,7 +2724,9 @@ msgstr "B<--list>"
#. type: =item
#: ../builder/virt-builder.pod:310
-msgid "B<--list --format> format"
+#, fuzzy
+#| msgid "B<--list --format> format"
+msgid "B<--list --list-format> format"
msgstr "B<--list --format> ФОРМАТ"
#. type: =item
@@ -2740,8 +2742,8 @@ msgstr "Показати список доступних шаблонів."
#. type: textblock
#: ../builder/virt-builder.pod:316
msgid ""
-"It is possible to choose with I<--format> the output format for the list "
-"templates:"
+"It is possible to choose with I<--list-format> the output format for the "
+"list templates:"
msgstr ""
#. type: =item
@@ -2801,13 +2803,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:445
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:210
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:211
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:447
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:212
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:213
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2903,8 +2905,8 @@ msgstr ""
#: ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29
#: ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366
#: ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../src/guestfs.pod:2091
-#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:746
-#: ../v2v/virt-v2v.pod:859
+#: ../src/guestfs.pod:2389 ../src/guestfs.pod:3882 ../v2v/virt-v2v.pod:749
+#: ../v2v/virt-v2v.pod:862
msgid "1."
msgstr "1."
@@ -2923,8 +2925,8 @@ msgstr ""
#: ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42
#: ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373
#: ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../src/guestfs.pod:2095
-#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:760
-#: ../v2v/virt-v2v.pod:866
+#: ../src/guestfs.pod:2393 ../src/guestfs.pod:3907 ../v2v/virt-v2v.pod:763
+#: ../v2v/virt-v2v.pod:869
msgid "2."
msgstr "2."
@@ -2942,8 +2944,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:768
-#: ../v2v/virt-v2v.pod:872
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:875
msgid "3."
msgstr "3."
@@ -2958,7 +2960,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:789
+#: ../v2v/virt-v2v.pod:792
msgid "4."
msgstr "4."
@@ -5509,7 +5511,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:834
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:837
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5544,7 +5546,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:849
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:852
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5593,7 +5595,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:920
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:923
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5607,7 +5609,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:925
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:928
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>)."
@@ -5615,13 +5617,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:928
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:931
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:932
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:935
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5636,7 +5638,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:939
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:942
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8696,7 +8698,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:958
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:961
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8832,7 +8834,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:71
#: ../p2v/virt-p2v-make-kickstart.pod:159 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:883
+#: ../v2v/virt-v2v.pod:886
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -51117,7 +51119,7 @@ msgstr ""
"L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:977
+#: ../p2v/virt-p2v.pod:269 ../v2v/virt-v2v.pod:980
msgid "Matthew Booth"
msgstr ""
@@ -52657,7 +52659,7 @@ msgstr "Увімкнути показ діагностичних повідом
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:148
+#: ../v2v/virt-v2v.pod:149
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -53129,7 +53131,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:840
+#: ../v2v/virt-v2v.pod:843
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -53162,7 +53164,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:852
+#: ../v2v/virt-v2v.pod:855
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53170,13 +53172,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:855
+#: ../v2v/virt-v2v.pod:858
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:861
+#: ../v2v/virt-v2v.pod:864
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53184,7 +53186,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:864
+#: ../v2v/virt-v2v.pod:867
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53195,7 +53197,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:868
+#: ../v2v/virt-v2v.pod:871
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53879,7 +53881,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:363
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54059,7 +54061,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:903
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:906
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54073,7 +54075,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:906
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:909
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 "
@@ -54081,7 +54083,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:910
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:913
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -54096,7 +54098,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:918
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:921
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86821,7 +86823,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:9 ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" virt-v2v -ic vpx://esx.example.com/Datacenter/esxi \\\n"
@@ -86830,7 +86832,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:130
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:131
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86843,7 +86845,7 @@ msgstr ""
"\n"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:121
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86856,7 +86858,7 @@ msgstr ""
"\n"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:112
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86905,13 +86907,13 @@ msgid ""
" ┌────────────┐\n"
" -i disk ───────────┐ │ │ ┌───────▶ -o local\n"
" -i ova ─────────┐ └──▶ │ virt-v2v │ │\n"
-" └────▶ │ conversion │ ──┘\n"
-" ESX ──▶┌────────────┐ │ server │ ┌────────────┐\n"
-" Xen ──▶│ -i libvirt ──▶ │ │ ───▶ -o libvirt │─▶ KVM\n"
-" ... ──▶│ (default) │ │ │ │ (default) │\n"
-" └────────────┘ │ │ ──┐└────────────┘\n"
-" -i libvirtxml ────────▶ │ │ ─┐└──────▶ -o glance\n"
-" └────────────┘ └─────────▶ -o rhev\n"
+" └────▶ │ conversion │ ──┘┌────────────┐\n"
+" ESX ──▶┌────────────┐ │ server │ ───▶ -o libvirt │─▶ KVM\n"
+" Xen ──▶│ -i libvirt ──▶ │ │ │ (default) │\n"
+" ... ──▶│ (default) │ │ │ ──┐└────────────┘\n"
+" └────────────┘ │ │ ─┐└──────▶ -o glance\n"
+" -i libvirtxml ────────▶ │ │ ┐└─────────▶ -o rhev\n"
+" └────────────┘ └──────────▶ -o vdsm\n"
"\n"
msgstr ""
@@ -86971,16 +86973,18 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:69
-msgid "I<-o rhev> is used to write to a RHEV-M / oVirt target."
+msgid ""
+"I<-o rhev> is used to write to a RHEV-M / oVirt target. I<-o vdsm> is only "
+"used when virt-v2v runs under VDSM control."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:74
msgid "Convert from VMware vCenter server to local libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:76
msgid ""
"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 "
@@ -86988,7 +86992,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:81
#, no-wrap
msgid ""
" virt-v2v -ic vpx://example.com/Datacenter/esxi esx_guest\n"
@@ -86996,7 +87000,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:83
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</"
@@ -87004,17 +87008,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:87
msgid "For more information see L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:88
+#: ../v2v/virt-v2v.pod:89
msgid "Convert from ESX to RHEV-M/oVirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:91
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 "
@@ -87025,12 +87029,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:101
msgid "In this case the host running virt-v2v acts as a B<conversion server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:103
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 "
@@ -87038,21 +87042,21 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:107
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to OpenStack glance"
msgstr "Створення порожніх образів дисків"
#. type: textblock
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:109
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:114
#, fuzzy
#| msgid "To run this tool on a disk image directly, use the I<-a> option:"
msgid "To control the name of the image in glance, use the I<-on> option."
@@ -87061,28 +87065,28 @@ msgstr ""
"параметром I<-a>:"
#. type: =head2
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:116
#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "Створення порожніх образів дисків"
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:118
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:122
+#: ../v2v/virt-v2v.pod:123
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:126
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 "
@@ -87091,47 +87095,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:132
+#: ../v2v/virt-v2v.pod:133
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:144
+#: ../v2v/virt-v2v.pod:145
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:146
+#: ../v2v/virt-v2v.pod:147
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:150
+#: ../v2v/virt-v2v.pod:151
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:154
+#: ../v2v/virt-v2v.pod:155
#, fuzzy
#| msgid "B<gdisk>"
msgid "B<-i disk>"
msgstr "B<gdisk>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:157
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:159
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 "
@@ -87141,34 +87145,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:165
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:167
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:169
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:171
+#: ../v2v/virt-v2v.pod:172
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:173
+#: ../v2v/virt-v2v.pod:174
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:176
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 "
@@ -87177,31 +87181,31 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:180
+#: ../v2v/virt-v2v.pod:181
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:183
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:184
+#: ../v2v/virt-v2v.pod:185
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i ova>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:187
msgid "Set the input method to I<ova>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:189
msgid ""
"In this mode you can read a VMware ova file. Virt-v2v will read the ova "
"manifest file and check the vmdk volumes for validity (checksums) as well "
@@ -87209,19 +87213,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:192
+#: ../v2v/virt-v2v.pod:193
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:194
+#: ../v2v/virt-v2v.pod:195
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:197
+#: ../v2v/virt-v2v.pod:198
msgid ""
"Only local libvirt connections, ESX connections, or RHEL 5 Xen remote "
"connections can be used. Other remote libvirt connections will not work in "
@@ -87229,54 +87233,54 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:202
msgid ""
"See also L</INPUT FROM VMWARE VCENTER SERVER>, L</INPUT FROM RHEL 5 XEN> "
"below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:204
+#: ../v2v/virt-v2v.pod:205
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:207
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:216
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:219
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:220
+#: ../v2v/virt-v2v.pod:221
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:223
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:225
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 "
@@ -87284,28 +87288,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:229
#, 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:230
+#: ../v2v/virt-v2v.pod:231
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:232
+#: ../v2v/virt-v2v.pod:233
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:235
+#: ../v2v/virt-v2v.pod:236
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 "
@@ -87313,40 +87317,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:240
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:242
+#: ../v2v/virt-v2v.pod:243
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:244
+#: ../v2v/virt-v2v.pod:245
#, fuzzy
#| msgid "B<gdisk>"
msgid "B<-o disk>"
msgstr "B<gdisk>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:247
#, fuzzy
#| msgid "This is the default."
msgid "This is the same as I<-o local>."
msgstr "Типове значення."
#. type: =item
-#: ../v2v/virt-v2v.pod:248
+#: ../v2v/virt-v2v.pod:249
#, fuzzy
#| msgid "B<-o kernel_cache>"
msgid "B<-o glance>"
msgstr "B<-o kernel_cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:250
+#: ../v2v/virt-v2v.pod:251
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
"is uploaded to Glance. You can control the image name by setting the I<-on> "
@@ -87354,41 +87358,41 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:254
+#: ../v2v/virt-v2v.pod:255
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:256
+#: ../v2v/virt-v2v.pod:257
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:259
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:261
+#: ../v2v/virt-v2v.pod:262
#, 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:263
+#: ../v2v/virt-v2v.pod:264
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:265
+#: ../v2v/virt-v2v.pod:266
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:267
+#: ../v2v/virt-v2v.pod:268
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 "
@@ -87396,7 +87400,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:272
#, no-wrap
msgid ""
" /dir/name-sda\n"
@@ -87406,12 +87410,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:276
msgid "and a libvirt XML file is created containing guest metadata:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:278
#, no-wrap
msgid ""
" /dir/name.xml\n"
@@ -87419,34 +87423,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:280
msgid "where C<name> is the guest name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:281
+#: ../v2v/virt-v2v.pod:282
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o параметр>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:284
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:286
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:288
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:290
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 "
@@ -87455,97 +87459,116 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:295
+#, fuzzy
+#| msgid "B<gdisk>"
+msgid "B<-o vdsm>"
+msgstr "B<gdisk>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:297
+msgid "Set the output method to I<vdsm>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:299
+msgid ""
+"This mode is similar to I<-o rhev> but is only used by RHEV VDSM when it "
+"runs virt-v2v under VDSM control."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:302
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:304
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:306
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:308
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:310
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:305
+#: ../v2v/virt-v2v.pod:313
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:308
+#: ../v2v/virt-v2v.pod:316
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:318
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:320
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:314
+#: ../v2v/virt-v2v.pod:322
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:324
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:319
+#: ../v2v/virt-v2v.pod:327
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:329
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:331
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:334
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:328
+#: ../v2v/virt-v2v.pod:336
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:331
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87553,7 +87576,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:333
+#: ../v2v/virt-v2v.pod:341
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. "
@@ -87561,7 +87584,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:337
+#: ../v2v/virt-v2v.pod:345
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 "
@@ -87569,21 +87592,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:350
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:345
+#: ../v2v/virt-v2v.pod:353
#, fuzzy
#| msgid "B<--print-cache>"
msgid "B<--print-source>"
msgstr "B<--print-cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:347
+#: ../v2v/virt-v2v.pod:355
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 "
@@ -87591,105 +87614,37 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:357
-msgid "B<--rhev-image-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:359
-msgid "B<--rhev-vol-uuid> UUID"
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:361
-#, fuzzy
-#| msgid "B<lvm-uuids> *"
-msgid "B<--rhev-vm-uuid> UUID"
-msgstr "B<lvm-uuids> *"
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:363
-msgid "Normally the RHEV output mode chooses a random UUID for each of:"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:369
-msgid "the image directory (I<--rhev-image-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:373
-msgid "once for each guest disk (I<--rhev-vol-uuid>)"
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:377
-msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:381
-msgid "However you can force specific UUIDs instead by using these options."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:383
-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:386
-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:390
-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:393
-msgid "These options can only be used with I<-o rhev>."
-msgstr ""
-
-#. type: =item
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:365
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:397
+#: ../v2v/virt-v2v.pod:367
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:399
+#: ../v2v/virt-v2v.pod:369
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:371
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:403
+#: ../v2v/virt-v2v.pod:373
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:405
+#: ../v2v/virt-v2v.pod:375
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:377
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 "
@@ -87700,14 +87655,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:385
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:418
+#: ../v2v/virt-v2v.pod:388
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 "
@@ -87716,7 +87671,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:393
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 "
@@ -87724,7 +87679,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:397
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 "
@@ -87733,7 +87688,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:432
+#: ../v2v/virt-v2v.pod:402
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 "
@@ -87743,32 +87698,91 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:408
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-image-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:410
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-vol-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:412
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--vdsm-vm-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:414
+msgid ""
+"Normally the RHEV output mode chooses random UUIDs for the target guest. "
+"However VDSM needs to control the UUIDs and passes these parameters when "
+"virt-v2v runs under VDSM control. The parameters control:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:423
+msgid "the image directory (I<--vdsm-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:427
+msgid ""
+"UUIDs for each guest disk (I<--vdsm-vol-uuid>) (this option is passed once "
+"for each guest disk)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:432
+msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:436
+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:439
+msgid "These options can only be used with I<-o vdsm>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:453
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:452
+#: ../v2v/virt-v2v.pod:455
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:454
+#: ../v2v/virt-v2v.pod:457
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 "
-"default is chosen based on the detected guest operating system."
+"For the I<-o rhev> or I<-o vdsm> targets only, specify the type of guest. "
+"You can set this to C<desktop> or C<server>. If the option is not given, "
+"then a suitable default is chosen based on the detected guest operating "
+"system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:465
+#: ../v2v/virt-v2v.pod:468
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:470
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 "
@@ -87777,7 +87791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:472
+#: ../v2v/virt-v2v.pod:475
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87785,7 +87799,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:479
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87793,7 +87807,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:481
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87806,7 +87820,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:488
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87815,7 +87829,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:491
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87827,7 +87841,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:494
+#: ../v2v/virt-v2v.pod:497
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87836,7 +87850,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:500
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87844,19 +87858,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:502
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:504
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:504
+#: ../v2v/virt-v2v.pod:507
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 "
@@ -87864,7 +87878,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:512
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 "
@@ -87872,7 +87886,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:514
+#: ../v2v/virt-v2v.pod:517
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -87880,7 +87894,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:519
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -87888,7 +87902,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:521
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -87898,7 +87912,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:522
+#: ../v2v/virt-v2v.pod:525
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87906,7 +87920,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:524
+#: ../v2v/virt-v2v.pod:527
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87914,7 +87928,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:526
+#: ../v2v/virt-v2v.pod:529
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87922,7 +87936,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:531
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87930,7 +87944,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87938,7 +87952,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:535
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87946,7 +87960,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:534
+#: ../v2v/virt-v2v.pod:537
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87955,12 +87969,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:540
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:542
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 "
@@ -87968,7 +87982,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:547
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 "
@@ -87978,14 +87992,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:550
+#: ../v2v/virt-v2v.pod:553
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:553
+#: ../v2v/virt-v2v.pod:556
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -87996,21 +88010,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:558
+#: ../v2v/virt-v2v.pod:561
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:561
+#: ../v2v/virt-v2v.pod:564
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:564
+#: ../v2v/virt-v2v.pod:567
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -88018,12 +88032,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:569
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:568
+#: ../v2v/virt-v2v.pod:571
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -88031,14 +88045,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:573
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:573
+#: ../v2v/virt-v2v.pod:576
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -88049,7 +88063,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:578
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -88057,23 +88071,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:583
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:585
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:587
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:587
+#: ../v2v/virt-v2v.pod:590
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 "
@@ -88081,12 +88095,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:591
+#: ../v2v/virt-v2v.pod:594
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:593
+#: ../v2v/virt-v2v.pod:596
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -88094,7 +88108,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:595
+#: ../v2v/virt-v2v.pod:598
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 "
@@ -88103,25 +88117,25 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:603
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:602
+#: ../v2v/virt-v2v.pod:605
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:607
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:607
+#: ../v2v/virt-v2v.pod:610
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -88130,7 +88144,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:613
#, no-wrap
msgid ""
" Id Name State\n"
@@ -88141,7 +88155,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:615
+#: ../v2v/virt-v2v.pod:618
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 "
@@ -88150,7 +88164,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:620
+#: ../v2v/virt-v2v.pod:623
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -88158,14 +88172,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622 ../v2v/virt-v2v.pod:690
+#: ../v2v/virt-v2v.pod:625 ../v2v/virt-v2v.pod:693
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:628
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -88177,7 +88191,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:631
+#: ../v2v/virt-v2v.pod:634
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 "
@@ -88185,17 +88199,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:638
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:637
+#: ../v2v/virt-v2v.pod:640
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:639
+#: ../v2v/virt-v2v.pod:642
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -88205,13 +88219,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:643
+#: ../v2v/virt-v2v.pod:646
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:649
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -88219,7 +88233,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650 ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:653 ../v2v/virt-v2v.pod:717
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 "
@@ -88227,17 +88241,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:654
+#: ../v2v/virt-v2v.pod:657
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:659
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:658
+#: ../v2v/virt-v2v.pod:661
msgid ""
"Virt-v2v uses libvirt for access to the remote Xen host, and therefore the "
"input mode should be I<-i libvirt>. As this is the default, you don't need "
@@ -88245,33 +88259,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:662
+#: ../v2v/virt-v2v.pod:665
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:664
+#: ../v2v/virt-v2v.pod:667
msgid ""
"Currently you must enable passwordless SSH access to the remote Xen host "
"from the virt-v2v conversion server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:667
+#: ../v2v/virt-v2v.pod:670
msgid ""
"You must also use ssh-agent, and add your ssh public key to C</root/.ssh/"
"authorized_keys> (on the Xen host)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:673
msgid ""
"After doing this, you should check that passwordless access works from the "
"virt-v2v server to the Xen host. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:676
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -88280,24 +88294,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:676
+#: ../v2v/virt-v2v.pod:679
msgid ""
"Note that password-interactive and Kerberos access are B<not> supported. "
"You B<have> to set up ssh access using ssh-agent and authorized_keys."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:680
+#: ../v2v/virt-v2v.pod:683
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:682
+#: ../v2v/virt-v2v.pod:685
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:684
+#: ../v2v/virt-v2v.pod:687
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -88309,7 +88323,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:696
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -88321,7 +88335,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:699
+#: ../v2v/virt-v2v.pod:702
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration or the remote server before "
@@ -88329,17 +88343,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:703
+#: ../v2v/virt-v2v.pod:706
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:705
+#: ../v2v/virt-v2v.pod:708
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:707
+#: ../v2v/virt-v2v.pod:710
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -88349,58 +88363,58 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:711
+#: ../v2v/virt-v2v.pod:714
msgid ""
"where C<rhel49-x86_64-pv> is the name of the guest (which must be shut down)."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:721
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:720
+#: ../v2v/virt-v2v.pod:723
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:727
+#: ../v2v/virt-v2v.pod:730
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:735
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:737
+#: ../v2v/virt-v2v.pod:740
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:741
+#: ../v2v/virt-v2v.pod:744
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:748
+#: ../v2v/virt-v2v.pod:751
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:751
+#: ../v2v/virt-v2v.pod:754
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -88413,14 +88427,14 @@ msgstr ""
"\n"
#. type: textblock
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:756
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
#. type: verbatim
-#: ../v2v/virt-v2v.pod:755
+#: ../v2v/virt-v2v.pod:758
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -88429,17 +88443,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:758
+#: ../v2v/virt-v2v.pod:761
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:762
+#: ../v2v/virt-v2v.pod:765
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:764
+#: ../v2v/virt-v2v.pod:767
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -88449,14 +88463,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:770
+#: ../v2v/virt-v2v.pod:773
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:773
+#: ../v2v/virt-v2v.pod:776
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -88468,7 +88482,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:779
+#: ../v2v/virt-v2v.pod:782
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 "
@@ -88476,7 +88490,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:783
+#: ../v2v/virt-v2v.pod:786
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -88488,12 +88502,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:791
+#: ../v2v/virt-v2v.pod:794
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:793
+#: ../v2v/virt-v2v.pod:796
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -88501,19 +88515,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:797
+#: ../v2v/virt-v2v.pod:800
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:799
+#: ../v2v/virt-v2v.pod:802
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:803
+#: ../v2v/virt-v2v.pod:806
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 "
@@ -88521,7 +88535,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:807
+#: ../v2v/virt-v2v.pod:810
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -88554,7 +88568,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:836
+#: ../v2v/virt-v2v.pod:839
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 "
@@ -88562,14 +88576,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:845
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:845
+#: ../v2v/virt-v2v.pod:848
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88579,7 +88593,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:874
+#: ../v2v/virt-v2v.pod:877
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 "
@@ -88587,36 +88601,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:880
+#: ../v2v/virt-v2v.pod:883
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:887
+#: ../v2v/virt-v2v.pod:890
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:889 ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:892 ../v2v/virt-v2v.pod:946
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:891
+#: ../v2v/virt-v2v.pod:894
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:901
+#: ../v2v/virt-v2v.pod:904
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:912
+#: ../v2v/virt-v2v.pod:915
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 "
@@ -88626,31 +88640,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:922
+#: ../v2v/virt-v2v.pod:925
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:934
+#: ../v2v/virt-v2v.pod:937
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:936
+#: ../v2v/virt-v2v.pod:939
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:941
+#: ../v2v/virt-v2v.pod:944
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:945
+#: ../v2v/virt-v2v.pod:948
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. "
@@ -88660,14 +88674,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:951
+#: ../v2v/virt-v2v.pod:954
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:965
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
@@ -88683,17 +88697,17 @@ msgstr ""
"libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:982
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:981
+#: ../v2v/virt-v2v.pod:984
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:986
msgid "Tingting Zheng"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 90440eb..3ab56ca 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 1afb9b5..562f831 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -75,19 +75,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -247,7 +246,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -458,7 +457,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -473,7 +472,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -517,27 +516,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -549,7 +552,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -604,11 +607,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -633,19 +636,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -662,15 +673,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -859,7 +878,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +934,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +1011,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +1022,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1055,6 +1078,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1157,7 +1184,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1187,7 +1214,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1211,7 +1238,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1219,7 +1246,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1234,7 +1261,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1243,7 +1270,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1251,11 +1278,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1296,6 +1323,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1328,7 +1359,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1344,7 +1375,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1352,7 +1383,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1383,15 +1414,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1578,7 +1609,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1682,7 +1713,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1712,7 +1743,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1724,15 +1755,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1780,7 +1811,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1965,7 +1996,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2165,11 +2196,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2287,19 +2317,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2385,6 +2415,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2437,12 +2471,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2617,18 +2651,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2636,7 +2670,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2645,16 +2679,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2699,11 +2731,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2711,15 +2743,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index a64c8e1..d860a6f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -74,19 +74,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -246,7 +245,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -457,7 +456,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -472,7 +471,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -516,27 +515,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -548,7 +551,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -603,11 +606,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -632,19 +635,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -661,15 +672,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -858,7 +877,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +933,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +1010,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +1021,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1054,6 +1077,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1156,7 +1183,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1186,7 +1213,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1210,7 +1237,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1218,7 +1245,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1233,7 +1260,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1242,7 +1269,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1250,11 +1277,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1295,6 +1322,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1327,7 +1358,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1343,7 +1374,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1351,7 +1382,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1382,15 +1413,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1577,7 +1608,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1681,7 +1712,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1711,7 +1742,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1723,15 +1754,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1779,7 +1810,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1964,7 +1995,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2164,11 +2195,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2286,19 +2316,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2384,6 +2414,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2436,12 +2470,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2616,18 +2650,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2635,7 +2669,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2644,16 +2678,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2698,11 +2730,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2710,15 +2742,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 818c76b..9c6ecc8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -74,19 +74,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -246,7 +245,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -457,7 +456,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -472,7 +471,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -516,27 +515,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -548,7 +551,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -603,11 +606,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -632,19 +635,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -661,15 +672,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -858,7 +877,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +933,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +1010,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +1021,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1054,6 +1077,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1156,7 +1183,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1186,7 +1213,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1210,7 +1237,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1218,7 +1245,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1233,7 +1260,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1242,7 +1269,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1250,11 +1277,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1295,6 +1322,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1327,7 +1358,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1343,7 +1374,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1351,7 +1382,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1382,15 +1413,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1577,7 +1608,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1681,7 +1712,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1711,7 +1742,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1723,15 +1754,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1779,7 +1810,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1964,7 +1995,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2164,11 +2195,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2286,19 +2316,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2384,6 +2414,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2436,12 +2470,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2616,18 +2650,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2635,7 +2669,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2644,16 +2678,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2698,11 +2730,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2710,15 +2742,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 70d8765..225748a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 7d16deb..5650dd1 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.42\n"
+"Project-Id-Version: libguestfs 1.27.43\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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"
@@ -72,19 +72,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -244,7 +243,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -455,7 +454,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -470,7 +469,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -514,27 +513,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -546,7 +549,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -601,11 +604,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -630,19 +633,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -659,15 +670,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -856,7 +875,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -908,7 +931,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -985,7 +1008,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -996,7 +1019,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1052,6 +1075,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1154,7 +1181,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1184,7 +1211,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1208,7 +1235,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1216,7 +1243,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1231,7 +1258,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1240,7 +1267,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1248,11 +1275,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1293,6 +1320,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1325,7 +1356,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1341,7 +1372,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1349,7 +1380,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1380,15 +1411,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1575,7 +1606,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1679,7 +1710,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1709,7 +1740,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1721,15 +1752,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1777,7 +1808,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1962,7 +1993,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2162,11 +2193,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2284,19 +2314,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2382,6 +2412,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2434,12 +2468,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2614,18 +2648,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2633,7 +2667,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2642,16 +2676,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2696,11 +2728,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2708,15 +2740,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 165561d..5fab348 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index eceba3f..d1db3e0 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -74,19 +74,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -246,7 +245,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -457,7 +456,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -472,7 +471,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -516,27 +515,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -548,7 +551,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -603,11 +606,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -632,19 +635,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -661,15 +672,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -858,7 +877,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +933,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +1010,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +1021,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1054,6 +1077,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1156,7 +1183,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1186,7 +1213,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1210,7 +1237,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1218,7 +1245,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1233,7 +1260,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1242,7 +1269,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1250,11 +1277,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1295,6 +1322,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1327,7 +1358,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1343,7 +1374,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1351,7 +1382,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1382,15 +1413,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1577,7 +1608,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1681,7 +1712,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1711,7 +1742,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1723,15 +1754,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1779,7 +1810,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1964,7 +1995,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2164,11 +2195,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2286,19 +2316,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2384,6 +2414,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2436,12 +2470,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2616,18 +2650,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2635,7 +2669,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2644,16 +2678,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2698,11 +2730,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2710,15 +2742,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 21fcc4a..ca0aff3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -75,19 +75,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -247,7 +246,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -458,7 +457,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -473,7 +472,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -517,27 +516,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -549,7 +552,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -604,11 +607,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -633,19 +636,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -662,15 +673,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -859,7 +878,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +934,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +1011,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +1022,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1055,6 +1078,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1157,7 +1184,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1187,7 +1214,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1211,7 +1238,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1219,7 +1246,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1234,7 +1261,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1243,7 +1270,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1251,11 +1278,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1296,6 +1323,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1328,7 +1359,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1344,7 +1375,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1352,7 +1383,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1383,15 +1414,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1578,7 +1609,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1682,7 +1713,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1712,7 +1743,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1724,15 +1755,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1780,7 +1811,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1965,7 +1996,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2165,11 +2196,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2287,19 +2317,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2385,6 +2415,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2437,12 +2471,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2617,18 +2651,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2636,7 +2670,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2645,16 +2679,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2699,11 +2731,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2711,15 +2743,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/or.po b/po/or.po
index 0f81c20..3638b3f 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 05a5bbd..835f48f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -74,19 +74,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -246,7 +245,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -457,7 +456,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -472,7 +471,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -516,27 +515,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -548,7 +551,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -603,11 +606,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -632,19 +635,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -661,15 +672,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -858,7 +877,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -910,7 +933,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -987,7 +1010,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -998,7 +1021,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1054,6 +1077,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1156,7 +1183,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1186,7 +1213,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1210,7 +1237,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1218,7 +1245,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1233,7 +1260,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1242,7 +1269,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1250,11 +1277,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1295,6 +1322,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1327,7 +1358,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1343,7 +1374,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1351,7 +1382,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1382,15 +1413,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1577,7 +1608,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1681,7 +1712,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1711,7 +1742,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1723,15 +1754,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1779,7 +1810,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1964,7 +1995,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2164,11 +2195,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2286,19 +2316,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2384,6 +2414,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2436,12 +2470,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2616,18 +2650,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2635,7 +2669,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2644,16 +2678,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2698,11 +2730,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2710,15 +2742,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 635a911..c999798 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -77,19 +77,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -249,7 +248,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -460,7 +459,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -475,7 +474,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -519,27 +518,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -551,7 +554,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -606,11 +609,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -635,19 +638,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -664,15 +675,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -861,7 +880,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -913,7 +936,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -990,7 +1013,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -1001,7 +1024,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1057,6 +1080,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1159,7 +1186,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1189,7 +1216,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1213,7 +1240,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1221,7 +1248,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1236,7 +1263,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1245,7 +1272,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1253,11 +1280,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1298,6 +1325,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1330,7 +1361,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1346,7 +1377,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1354,7 +1385,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1385,15 +1416,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1580,7 +1611,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1684,7 +1715,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1714,7 +1745,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1726,15 +1757,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1782,7 +1813,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1967,7 +1998,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2167,11 +2198,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2289,19 +2319,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2387,6 +2417,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2439,12 +2473,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2619,18 +2653,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2638,7 +2672,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2647,16 +2681,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2701,11 +2733,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2713,15 +2745,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 5578a11..8669c04 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 2c229b6..7caafc9 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -73,19 +73,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -245,7 +244,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -456,7 +455,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -471,7 +470,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -515,27 +514,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -547,7 +550,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -602,11 +605,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -631,19 +634,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -660,15 +671,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -857,7 +876,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -909,7 +932,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -986,7 +1009,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -997,7 +1020,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1053,6 +1076,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1155,7 +1182,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1185,7 +1212,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1209,7 +1236,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1217,7 +1244,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1232,7 +1259,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1241,7 +1268,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1249,11 +1276,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1294,6 +1321,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1326,7 +1357,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1342,7 +1373,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1350,7 +1381,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1381,15 +1412,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1576,7 +1607,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1680,7 +1711,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1710,7 +1741,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1722,15 +1753,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1778,7 +1809,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1963,7 +1994,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2163,11 +2194,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2285,19 +2315,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2383,6 +2413,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2435,12 +2469,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2615,18 +2649,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2634,7 +2668,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2643,16 +2677,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2697,11 +2729,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2709,15 +2741,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 0fca93f..7512bc4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-10 22:07+0100\n"
+"POT-Creation-Date: 2014-09-11 19:36+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/"
@@ -75,19 +75,18 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/output_RHEV.ml:285
+#: ../v2v/output_rhev.ml:92
msgid ""
"%s does not exist or is not a directory.\n"
"\n"
-"Most likely cause: Either the Export Storage Domain (%s) has not been "
-"attached to any Data Center, or the path %s is not an Export Storage Domain "
-"at all.\n"
+"Most likely cause: Either the %s (%s) has not been attached to any Data "
+"Center, or the path %s is not an %s at all.\n"
"\n"
-"You have to attach the Export Storage Domain to a Data Center using the RHEV-"
-"M / OVirt user interface first.\n"
+"You have to attach the %s to a Data Center using the RHEV-M / OVirt user "
+"interface first.\n"
"\n"
-"If you don't know what the Export Storage Domain mount point should be then "
-"you can also find this out through the RHEV-M user interface."
+"If you don't know what the %s mount point should be then you can also find "
+"this out through the RHEV-M user interface."
msgstr ""
#: ../v2v/cmdline.ml:81 ../v2v/cmdline.ml:55
@@ -247,7 +246,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:157
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -458,7 +457,7 @@ msgid ""
"read the man page virt-resize(1).\n"
msgstr ""
-#: ../builder/cmdline.ml:324
+#: ../builder/cmdline.ml:328
msgid ""
"%s: sorry, cannot run commands on a guest with a different architecture\n"
msgstr ""
@@ -473,7 +472,7 @@ msgid ""
"%s: sorry, don't know how to use --update with the '%s' package manager\n"
msgstr ""
-#: ../builder/cmdline.ml:300
+#: ../builder/cmdline.ml:304
msgid "%s: source and fingerprint lists are not the same length\n"
msgstr ""
@@ -517,27 +516,31 @@ msgid ""
"virt-resize only supports MBR (DOS) and GPT partition tables."
msgstr ""
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:272
msgid ""
"%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
"need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:279
msgid ""
"%s: virt-builder --get-kernel image\n"
"Missing 'image' (disk image file) argument.\n"
msgstr ""
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:282
msgid "%s: virt-builder --get-kernel: too many parameters\n"
msgstr ""
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:253
msgid "%s: virt-builder --list does not need any extra arguments.\n"
msgstr ""
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:247
+msgid "%s: virt-builder --list: use '--list-format', not '--format'.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:260
msgid ""
"%s: virt-builder --notes os-version\n"
"Missing 'os-version'. Use '--list' to list available template names.\n"
@@ -549,7 +552,7 @@ msgid ""
"Missing 'os-version'. Use '--list' to list available template names.\n"
msgstr ""
-#: ../builder/cmdline.ml:259 ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:263 ../builder/cmdline.ml:242
msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
msgstr ""
@@ -604,11 +607,11 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:276
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:285
+#: ../v2v/cmdline.ml:286
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -633,19 +636,27 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:295 ../v2v/cmdline.ml:283 ../v2v/cmdline.ml:273
-msgid "--vmtype option can only be used with '-o rhev'"
+#: ../v2v/cmdline.ml:274
+msgid "--vmtype option cannot be used with '-o glance'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:284
+msgid "--vmtype option cannot be used with '-o libvirt'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:296
+msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
#: ../v2v/input_disk.ml:49
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:269
+#: ../v2v/cmdline.ml:270
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:271
+#: ../v2v/cmdline.ml:272
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
@@ -662,15 +673,23 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:290
+#: ../v2v/cmdline.ml:291
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:300
+#: ../v2v/cmdline.ml:301
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:292
+#: ../v2v/cmdline.ml:308
+msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+msgstr ""
+
+#: ../v2v/cmdline.ml:306
+msgid "-o vdsm: output storage was not specified, use '-os'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:293
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -859,7 +878,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:120 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
+#: ../v2v/output_vdsm.ml:84
+msgid "Data Domain"
+msgstr ""
+
+#: ../v2v/cmdline.ml:121 ../sparsify/cmdline.ml:73 ../resize/resize.ml:187
msgid "Debug GC and memory allocations"
msgstr ""
@@ -911,7 +934,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:148 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -988,7 +1011,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:145 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:146 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -999,7 +1022,7 @@ msgstr ""
#. ../resize/resize.ml:215
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:150 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:151 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1055,6 +1078,10 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_rhev.ml:167
+msgid "Export Storage Domain"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:243
msgid "FILE"
msgstr ""
@@ -1157,7 +1184,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:144
+#: ../v2v/cmdline.ml:139
msgid "How to choose root filesystem"
msgstr ""
@@ -1187,7 +1214,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:124
+#: ../v2v/cmdline.ml:125
msgid "Input format (for -i disk)"
msgstr ""
@@ -1211,7 +1238,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:128
+#: ../v2v/cmdline.ml:129
msgid "Just write the metadata"
msgstr ""
@@ -1219,7 +1246,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:131 ../v2v/cmdline.ml:122
+#: ../v2v/cmdline.ml:132 ../v2v/cmdline.ml:123
msgid "Libvirt URI"
msgstr ""
@@ -1234,7 +1261,7 @@ msgstr ""
#. ../resize/resize.ml:194
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:125 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:126 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1243,7 +1270,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:126 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
+#: ../v2v/cmdline.ml:127 ../sparsify/cmdline.ml:79 ../resize/resize.ml:199
msgid "Make output machine readable"
msgstr ""
@@ -1251,11 +1278,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:120
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:127
+#: ../v2v/cmdline.ml:128
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1296,6 +1323,10 @@ msgid ""
"%s\n"
msgstr ""
+#: ../v2v/output_vdsm.ml:103
+msgid "OVF (metadata) directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
msgid ""
"On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
@@ -1328,7 +1359,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:143
+#: ../v2v/cmdline.ml:145
msgid "Output VM UUID"
msgstr ""
@@ -1344,7 +1375,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:139
+#: ../v2v/cmdline.ml:141
msgid "Output image UUID"
msgstr ""
@@ -1352,7 +1383,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:141
+#: ../v2v/cmdline.ml:143
msgid "Output vol UUID(s)"
msgstr ""
@@ -1383,15 +1414,15 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:135
+#: ../v2v/cmdline.ml:136
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:136 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:137 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/output_RHEV.ml:483 ../v2v/output_RHEV.ml:408
+#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1578,7 +1609,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:133
+#: ../v2v/cmdline.ml:134
msgid "Rename guest when converting"
msgstr ""
@@ -1682,7 +1713,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:121
+#: ../v2v/cmdline.ml:122
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1712,7 +1743,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:130
+#: ../v2v/cmdline.ml:131
msgid "Set output allocation mode"
msgstr ""
@@ -1724,15 +1755,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:132
+#: ../v2v/cmdline.ml:133
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:130
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:134
+#: ../v2v/cmdline.ml:135
msgid "Set output storage location"
msgstr ""
@@ -1780,7 +1811,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:150
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1965,7 +1996,7 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/output_RHEV.ml:707
+#: ../v2v/lib_ovf.ml:296
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 "
@@ -2165,11 +2196,10 @@ msgstr ""
msgid "could not parse ovf:Name from OVF document"
msgstr ""
-#: ../v2v/output_RHEV.ml:263
+#: ../v2v/output_rhev.ml:70
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"
+"could not read the %s specified by the '-os %s' parameter on the command "
+"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
#: ../v2v/output_libvirt.ml:254
@@ -2287,19 +2317,19 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:231
+#: ../v2v/cmdline.ml:232
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:252
+#: ../v2v/cmdline.ml:253
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:243
+#: ../v2v/cmdline.ml:244
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:261
+#: ../v2v/cmdline.ml:262
msgid "expecting an OVA file name on the command line"
msgstr ""
@@ -2385,6 +2415,10 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
+#: ../v2v/output_vdsm.ml:94
+msgid "image directory (%s) does not exist or is not a directory"
+msgstr ""
+
#: ../v2v/input_libvirtxml.ml:68
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
@@ -2437,12 +2471,12 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/output_RHEV.ml:240
+#: ../v2v/output_rhev.ml:47
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
-"This probably means you didn't specify the right Export Storage Domain path "
-"[-os %s], or else you need to rerun virt-v2v as root."
+"This probably means you didn't specify the right %s path [-os %s], or else "
+"you need to rerun virt-v2v as root."
msgstr ""
#: ../v2v/v2v.ml:330
@@ -2617,18 +2651,18 @@ msgid ""
"Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page."
msgstr ""
-#: ../v2v/output_RHEV.ml:291
+#: ../v2v/output_rhev.ml:99
msgid ""
-"the Export Storage Domain (%s) is not writable.\n"
+"the %s (%s) is not writable.\n"
"\n"
"This probably means you need to run virt-v2v as 'root'.\n"
"\n"
"Original error was: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:335
+#: ../v2v/output_vdsm.ml:80
msgid ""
-"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"the number of '--vdsm-vol-uuid' parameters passed on the command line has to "
"match the number of guest disk images (for this guest: %d)"
msgstr ""
@@ -2636,7 +2670,7 @@ msgstr ""
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/output_RHEV.ml:398
+#: ../v2v/lib_ovf.ml:165
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2645,16 +2679,14 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/output_RHEV.ml:277
+#: ../v2v/output_rhev.ml:84
msgid ""
-"there are multiple UUIDs in the Export Storage Domain (%s). This is "
-"unexpected, and may be a bug in virt-v2v or OVirt."
+"there are multiple UUIDs in the %s (%s). This is unexpected, and may be a "
+"bug in virt-v2v or OVirt."
msgstr ""
-#: ../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?"
+#: ../v2v/output_rhev.ml:82
+msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHEV-M %s?"
msgstr ""
#: ../v2v/convert_windows.ml:252
@@ -2699,11 +2731,11 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:106
+#: ../v2v/cmdline.ml:107
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:208
+#: ../v2v/cmdline.ml:209
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
@@ -2711,15 +2743,15 @@ msgstr ""
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/output_RHEV.ml:163
+#: ../v2v/lib_ovf.ml:148
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list