[Pkg-libvirt-commits] [libguestfs] 34/179: Version 1.27.60.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 31 19:08:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 1e9b707e9bbcdba22caa262b33cc79c863c26c34
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Oct 8 15:44:01 2014 +0100
Version 1.27.60.
---
BUGS | 26 ++-
configure.ac | 2 +-
po-docs/ja.po | 466 ++++++++++++++++++++++----------------------
po-docs/libguestfs-docs.pot | 456 ++++++++++++++++++++++---------------------
po-docs/uk.po | 466 ++++++++++++++++++++++----------------------
po/en_GB.po | 179 ++++++++---------
po/es.po | 179 ++++++++---------
po/gu.po | 179 ++++++++---------
po/hi.po | 179 ++++++++---------
po/kn.po | 179 ++++++++---------
po/libguestfs.pot | 181 ++++++++---------
po/ml.po | 179 ++++++++---------
po/mr.po | 179 ++++++++---------
po/nl.po | 179 ++++++++---------
po/or.po | 179 ++++++++---------
po/pa.po | 179 ++++++++---------
po/pl.po | 179 ++++++++---------
po/ta.po | 179 ++++++++---------
po/te.po | 179 ++++++++---------
po/uk.po | 179 ++++++++---------
20 files changed, 2080 insertions(+), 2023 deletions(-)
diff --git a/BUGS b/BUGS
index 3a41b37..db370c6 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-10-07
+Last updated: 2014-10-08
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -407,6 +407,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1146832 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146832
virt-v2v fail to convert guest with disk type volume
+1150298 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150298
+ ARM 32 bit on Ubuntu: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -437,7 +440,10 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1145916 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
virt-v2v fails to convert win7 guest
-(139 bugs)
+1147313 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1147313
+ virt-v2v cmd with option --qemu-boot doesn't work: "qemu-system-x86_64: command not found"
+
+(141 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -452,6 +458,9 @@ You can help by testing the fixes.
1149640 POST https://bugzilla.redhat.com/show_bug.cgi?id=1149640
hardcoded el7 disttag in BR makes build fail on ppc64le
+1150475 POST https://bugzilla.redhat.com/show_bug.cgi?id=1150475
+ Exporting 2+ disk guest to RHEV, only one disk shows after import
+
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
@@ -482,9 +491,6 @@ You can help by testing the fixes.
1091856 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1091856
scrub-file can't handle link file
-1099284 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1099284
- typo errors in man pages
-
1113020 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1113020
Support virt-sparsify option to allow specifying temporary file or block device
@@ -530,10 +536,7 @@ You can help by testing the fixes.
1147065 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1147065
regression setting root password with virt-builder/virt-customize
-1147313 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1147313
- virt-v2v cmd with option --qemu-boot doesn't work: "qemu-system-x86_64: command not found"
-
-(30 bugs)
+(29 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
@@ -571,6 +574,9 @@ These bugs are in the VERIFIED state.
1099105 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099105
libguestfs Requires: /lib64/libldif-2.4.so.2 missing from openldap-2.4.39-6.el6.x86_64
+1099284 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099284
+ typo errors in man pages
+
1099332 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099332
typo errors in man pages
@@ -646,6 +652,6 @@ These bugs are in the VERIFIED state.
1146815 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1146815
virt-v2v prints warning: /files/etc/fstab/8/spec references unknown device "cdrom"
-(36 bugs)
+(37 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 69fbb0e..597ed49 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], [59])
+m4_define([libguestfs_release], [60])
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 3e376a4..02d96a5 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-07 15:26+0200\n"
+"POT-Creation-Date: 2014-10-08 15:39+0200\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -781,7 +781,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:443
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
-#: ../v2v/virt-v2v.pod:504
+#: ../v2v/virt-v2v.pod:505
msgid "B<-v>"
msgstr "B<-v>"
@@ -796,7 +796,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:445
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:507
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:226
-#: ../v2v/virt-v2v.pod:508
+#: ../v2v/virt-v2v.pod:509
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -827,7 +827,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../p2v/virt-p2v.pod:449 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:510
+#: ../v2v/virt-v2v.pod:511
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:230 ../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:512
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:513
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:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:514
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:515
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:234 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:525
+#: ../v2v/virt-v2v.pod:526
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:236
-#: ../v2v/virt-v2v.pod:527
+#: ../v2v/virt-v2v.pod:528
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1401,10 +1401,10 @@ msgstr "このプログラムは以下を返します:"
#: ../sysprep/virt-sysprep.pod:414 ../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:484 ../v2v/virt-v2v.pod:488
-#: ../v2v/virt-v2v.pod:493 ../v2v/virt-v2v.pod:708 ../v2v/virt-v2v.pod:712
-#: ../v2v/virt-v2v.pod:716 ../v2v/virt-v2v.pod:720 ../v2v/virt-v2v.pod:724
-#: ../v2v/virt-v2v.pod:853 ../v2v/virt-v2v.pod:858 ../v2v/virt-v2v.pod:863
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:484 ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:494 ../v2v/virt-v2v.pod:709 ../v2v/virt-v2v.pod:713
+#: ../v2v/virt-v2v.pod:717 ../v2v/virt-v2v.pod:721 ../v2v/virt-v2v.pod:725
+#: ../v2v/virt-v2v.pod:854 ../v2v/virt-v2v.pod:859 ../v2v/virt-v2v.pod:864
msgid "*"
msgstr "*"
@@ -1423,7 +1423,7 @@ msgstr ""
#. type: =item
#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286
-#: ../v2v/virt-v2v.pod:969
+#: ../v2v/virt-v2v.pod:970
msgid "1"
msgstr "1"
@@ -1434,7 +1434,7 @@ msgstr "ディスクイメージまたは仮想マシンのスキャン中にエ
#. type: =item
#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:974
msgid "2"
msgstr "2"
@@ -1488,7 +1488,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4750
#: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1244
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1245
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1528,7 +1528,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1260
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1261
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1559,7 +1559,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4814
#: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1270
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1271
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1889,7 +1889,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642
#: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:1181
+#: ../v2v/virt-v2v.pod:1182
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1928,7 +1928,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4810
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1258
+#: ../v2v/virt-v2v.pod:1259
msgid "AUTHORS"
msgstr "著者"
@@ -1959,7 +1959,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1272
+#: ../v2v/virt-v2v.pod:1273
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2898,8 +2898,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:1829 ../src/guestfs.pod:2101
-#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:874
-#: ../v2v/virt-v2v.pod:1143
+#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:875
+#: ../v2v/virt-v2v.pod:1144
msgid "1."
msgstr "1."
@@ -2918,8 +2918,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:1833 ../src/guestfs.pod:2105
-#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:888
-#: ../v2v/virt-v2v.pod:1150
+#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:889
+#: ../v2v/virt-v2v.pod:1151
msgid "2."
msgstr "2."
@@ -2937,8 +2937,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:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:896
-#: ../v2v/virt-v2v.pod:1156
+#: ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:1157
msgid "3."
msgstr "3."
@@ -2953,7 +2953,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:917
+#: ../v2v/virt-v2v.pod:918
msgid "4."
msgstr "4."
@@ -5368,7 +5368,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1108
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1109
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5403,7 +5403,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1129
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1130
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5452,7 +5452,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1204
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1205
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5466,7 +5466,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1209
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1210
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5474,13 +5474,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1212
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1213
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1216
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1217
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5495,7 +5495,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1223
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1224
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8646,7 +8646,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1242
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1243
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8786,7 +8786,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72
#: ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:1167
+#: ../v2v/virt-v2v.pod:1168
msgid "FILES"
msgstr "ファイル"
@@ -17428,7 +17428,7 @@ msgstr ""
#. type: =item
#: ../fish/guestfish-actions.pod:348 ../src/guestfs-actions.pod:446
-#: ../v2v/virt-v2v.pod:683
+#: ../v2v/virt-v2v.pod:684
msgid "C<server>"
msgstr ""
@@ -53760,7 +53760,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1262
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1263
msgid "Matthew Booth"
msgstr ""
@@ -55835,7 +55835,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:1114
+#: ../v2v/virt-v2v.pod:1115
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -55868,7 +55868,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:1136
+#: ../v2v/virt-v2v.pod:1137
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -55876,13 +55876,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:1139
+#: ../v2v/virt-v2v.pod:1140
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:1145
+#: ../v2v/virt-v2v.pod:1146
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -55890,7 +55890,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:1148
+#: ../v2v/virt-v2v.pod:1149
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -55901,7 +55901,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:1152
+#: ../v2v/virt-v2v.pod:1153
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -56778,7 +56778,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1187
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1188
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -56792,7 +56792,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1190
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1191
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 "
@@ -56800,7 +56800,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1194
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1195
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -56815,7 +56815,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1202
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1203
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -90695,45 +90695,47 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:486
-msgid "the image directory (I<--vdsm-image-uuid>)"
+msgid ""
+"the image directory of each guest disk (I<--vdsm-image-uuid>) (this option "
+"is passed once for each guest disk)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:491
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:495
+#: ../v2v/virt-v2v.pod:496
msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:500
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:502
+#: ../v2v/virt-v2v.pod:503
msgid "These options can only be used with I<-o vdsm>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:520
+#: ../v2v/virt-v2v.pod:521
msgid ""
"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, "
@@ -90742,12 +90744,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:532
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:534
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 "
@@ -90756,7 +90758,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:539
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -90764,7 +90766,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:543
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -90772,7 +90774,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:545
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -90785,7 +90787,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:551
+#: ../v2v/virt-v2v.pod:552
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -90794,7 +90796,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:554
+#: ../v2v/virt-v2v.pod:555
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -90806,7 +90808,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:561
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -90815,7 +90817,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -90823,19 +90825,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:566
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:568
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:570
+#: ../v2v/virt-v2v.pod:571
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 "
@@ -90843,7 +90845,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:576
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 "
@@ -90851,7 +90853,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -90859,7 +90861,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:583
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -90867,7 +90869,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:585
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -90877,7 +90879,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:589
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -90885,7 +90887,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:590
+#: ../v2v/virt-v2v.pod:591
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -90893,7 +90895,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:593
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -90901,7 +90903,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -90909,7 +90911,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:596
+#: ../v2v/virt-v2v.pod:597
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -90917,7 +90919,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:599
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -90925,7 +90927,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:601
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -90934,12 +90936,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:604
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:606
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 "
@@ -90947,7 +90949,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
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 "
@@ -90957,14 +90959,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
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:619
+#: ../v2v/virt-v2v.pod:620
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -90975,21 +90977,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:624
+#: ../v2v/virt-v2v.pod:625
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:627
+#: ../v2v/virt-v2v.pod:628
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:630
+#: ../v2v/virt-v2v.pod:631
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -90997,12 +90999,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:633
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:635
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -91010,14 +91012,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:636
+#: ../v2v/virt-v2v.pod:637
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:639
+#: ../v2v/virt-v2v.pod:640
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -91028,7 +91030,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:644
+#: ../v2v/virt-v2v.pod:645
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -91036,23 +91038,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:647
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:648
+#: ../v2v/virt-v2v.pod:649
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650
+#: ../v2v/virt-v2v.pod:651
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:653
+#: ../v2v/virt-v2v.pod:654
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 "
@@ -91060,12 +91062,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:657
+#: ../v2v/virt-v2v.pod:658
msgid "ESX: REMOVE VMWARE TOOLS FROM WINDOWS GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:660
msgid ""
"For Windows guests, you should remove VMware tools before conversion. "
"Although this is not strictly necessary, and the guest will still be able to "
@@ -91076,24 +91078,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:666
+#: ../v2v/virt-v2v.pod:667
msgid ""
"This is not necessary for Linux guests, as virt-v2v is able to remove VMware "
"tools."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:670
msgid "ESX: VCENTER URI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:671
+#: ../v2v/virt-v2v.pod:672
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -91101,54 +91103,54 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:675
+#: ../v2v/virt-v2v.pod:676
msgid "where:"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
msgid "C<user@>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:681
+#: ../v2v/virt-v2v.pod:682
msgid "is the (optional, but recommended) user to connect as"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid "is the vCenter Server (I<not> hypervisor)"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:687
+#: ../v2v/virt-v2v.pod:688
msgid "C<Datacenter>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:689
+#: ../v2v/virt-v2v.pod:690
msgid "is the name of the datacenter"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:691
+#: ../v2v/virt-v2v.pod:692
msgid "C<esxi>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:694
msgid "is the name of the ESXi hypervisor running the guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:698
msgid ""
"If the VMware deployment is using clusters and/or folders, then these may "
"need to be added to the URI, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:701
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/cluster1/esxi\n"
@@ -91156,55 +91158,55 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:702
+#: ../v2v/virt-v2v.pod:703
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:704
+#: ../v2v/virt-v2v.pod:705
msgid "Typical errors from libvirt / virsh when the URI is wrong include:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:710
+#: ../v2v/virt-v2v.pod:711
msgid "Could not find datacenter specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid "Could not find compute resource specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid "Path [...] does not specify a compute resource"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
msgid "Path [...] does not specify a host system"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:726
+#: ../v2v/virt-v2v.pod:727
msgid "Could not find host system specified in [...]"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:730
+#: ../v2v/virt-v2v.pod:731
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:733
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:735
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' list --all\n"
@@ -91213,7 +91215,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:739
#, no-wrap
msgid ""
" Id Name State\n"
@@ -91224,7 +91226,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:743
+#: ../v2v/virt-v2v.pod:744
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 "
@@ -91233,7 +91235,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:748
+#: ../v2v/virt-v2v.pod:749
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -91241,14 +91243,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:750 ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:751 ../v2v/virt-v2v.pod:819
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:754
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -91260,7 +91262,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:760
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 "
@@ -91268,17 +91270,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:763
+#: ../v2v/virt-v2v.pod:764
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:765
+#: ../v2v/virt-v2v.pod:766
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:767
+#: ../v2v/virt-v2v.pod:768
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -91288,13 +91290,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:772
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:774
+#: ../v2v/virt-v2v.pod:775
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 "
@@ -91302,7 +91304,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:778 ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:779 ../v2v/virt-v2v.pod:843
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 "
@@ -91310,17 +91312,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:782
+#: ../v2v/virt-v2v.pod:783
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:784
+#: ../v2v/virt-v2v.pod:785
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:786
+#: ../v2v/virt-v2v.pod:787
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 "
@@ -91328,33 +91330,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:791
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:793
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:795
+#: ../v2v/virt-v2v.pod:796
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:798
+#: ../v2v/virt-v2v.pod:799
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:801
+#: ../v2v/virt-v2v.pod:802
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -91363,24 +91365,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804
+#: ../v2v/virt-v2v.pod:805
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:808
+#: ../v2v/virt-v2v.pod:809
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:810
+#: ../v2v/virt-v2v.pod:811
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:813
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -91392,7 +91394,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:821
+#: ../v2v/virt-v2v.pod:822
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -91404,7 +91406,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -91412,17 +91414,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:831
+#: ../v2v/virt-v2v.pod:832
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:833
+#: ../v2v/virt-v2v.pod:834
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:835
+#: ../v2v/virt-v2v.pod:836
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -91432,58 +91434,58 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:839
+#: ../v2v/virt-v2v.pod:840
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:846
+#: ../v2v/virt-v2v.pod:847
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:848
+#: ../v2v/virt-v2v.pod:849
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:855
+#: ../v2v/virt-v2v.pod:856
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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:865
+#: ../v2v/virt-v2v.pod:866
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:869
+#: ../v2v/virt-v2v.pod:870
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:876
+#: ../v2v/virt-v2v.pod:877
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:879
+#: ../v2v/virt-v2v.pod:880
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -91491,12 +91493,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:882
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:883
+#: ../v2v/virt-v2v.pod:884
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -91505,17 +91507,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:886
+#: ../v2v/virt-v2v.pod:887
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:890
+#: ../v2v/virt-v2v.pod:891
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:892
+#: ../v2v/virt-v2v.pod:893
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -91525,14 +91527,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:898
+#: ../v2v/virt-v2v.pod:899
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:901
+#: ../v2v/virt-v2v.pod:902
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -91544,7 +91546,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:907
+#: ../v2v/virt-v2v.pod:908
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 "
@@ -91552,7 +91554,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:911
+#: ../v2v/virt-v2v.pod:912
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -91564,12 +91566,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:919
+#: ../v2v/virt-v2v.pod:920
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:921
+#: ../v2v/virt-v2v.pod:922
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -91577,12 +91579,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:925
+#: ../v2v/virt-v2v.pod:926
msgid "OUTPUT TO RHEV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:927
+#: ../v2v/virt-v2v.pod:928
msgid ""
"This section only applies to the I<-o rhev> output mode. If you use virt-"
"v2v from the RHEV-M user interface, then behind the scenes the import is "
@@ -91591,7 +91593,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:932
+#: ../v2v/virt-v2v.pod:933
msgid ""
"You have to specify I<-o rhev> and an I<-os> option that points to the RHEV-"
"M Export Storage Domain. You can either specify the NFS server and "
@@ -91602,7 +91604,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:939
+#: ../v2v/virt-v2v.pod:940
msgid ""
"On successful completion virt-v2v will have written the new guest to the "
"Export Storage Domain, but it will not yet be ready to run. It must be "
@@ -91610,7 +91612,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:944
msgid ""
"In RHEV E<ge> 2.2 this is done from the Storage tab. Select the export "
"domain the guest was written to. A pane will appear underneath the storage "
@@ -91620,24 +91622,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:951
msgid ""
"If you export several guests, then you can import them all at the same time "
"through the UI."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:953
+#: ../v2v/virt-v2v.pod:954
msgid "POST-CONVERSION TASKS"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:955
+#: ../v2v/virt-v2v.pod:956
msgid "Guest network configuration"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:957
+#: ../v2v/virt-v2v.pod:958
msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
@@ -91645,29 +91647,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:963
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:964
+#: ../v2v/virt-v2v.pod:965
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:972
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:975
+#: ../v2v/virt-v2v.pod:976
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:980
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -91675,7 +91677,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:984
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -91683,12 +91685,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:988
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:989
+#: ../v2v/virt-v2v.pod:990
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -91696,7 +91698,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:995
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -91708,12 +91710,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1002
+#: ../v2v/virt-v2v.pod:1003
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1004
+#: ../v2v/virt-v2v.pod:1005
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -91721,19 +91723,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1011
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1012
+#: ../v2v/virt-v2v.pod:1013
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1015
+#: ../v2v/virt-v2v.pod:1016
msgid ""
"You can avoid needing root here by mounting it yourself before running virt-"
"v2v, and passing I<-os /mountpoint> instead, but first of all read the next "
@@ -91741,12 +91743,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1019
+#: ../v2v/virt-v2v.pod:1020
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1021
+#: ../v2v/virt-v2v.pod:1022
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the UID:"
@@ -91754,7 +91756,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1025
+#: ../v2v/virt-v2v.pod:1026
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as non-"
@@ -91763,12 +91765,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1031
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1033
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -91776,7 +91778,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1038
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -91784,12 +91786,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1042
+#: ../v2v/virt-v2v.pod:1043
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1044
+#: ../v2v/virt-v2v.pod:1045
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -91797,12 +91799,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1051
+#: ../v2v/virt-v2v.pod:1052
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1054
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -91811,14 +91813,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1059
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1062
+#: ../v2v/virt-v2v.pod:1063
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -91830,19 +91832,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1071
+#: ../v2v/virt-v2v.pod:1072
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1073
+#: ../v2v/virt-v2v.pod:1074
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:1077
+#: ../v2v/virt-v2v.pod:1078
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 "
@@ -91850,7 +91852,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1081
+#: ../v2v/virt-v2v.pod:1082
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -91883,7 +91885,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1110
+#: ../v2v/virt-v2v.pod:1111
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 "
@@ -91891,14 +91893,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1116
+#: ../v2v/virt-v2v.pod:1117
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:1119
+#: ../v2v/virt-v2v.pod:1120
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -91914,7 +91916,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1133
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -91922,7 +91924,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1158
+#: ../v2v/virt-v2v.pod:1159
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 "
@@ -91930,36 +91932,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1164
+#: ../v2v/virt-v2v.pod:1165
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:1171
+#: ../v2v/virt-v2v.pod:1172
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1173 ../v2v/virt-v2v.pod:1227
+#: ../v2v/virt-v2v.pod:1174 ../v2v/virt-v2v.pod:1228
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1175
+#: ../v2v/virt-v2v.pod:1176
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:1185
+#: ../v2v/virt-v2v.pod:1186
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1196
+#: ../v2v/virt-v2v.pod:1197
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 "
@@ -91969,31 +91971,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1206
+#: ../v2v/virt-v2v.pod:1207
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1218
+#: ../v2v/virt-v2v.pod:1219
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1220
+#: ../v2v/virt-v2v.pod:1221
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:1225
+#: ../v2v/virt-v2v.pod:1226
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1229
+#: ../v2v/virt-v2v.pod:1230
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. "
@@ -92003,14 +92005,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1235
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1246
+#: ../v2v/virt-v2v.pod:1247
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)>, "
@@ -92018,16 +92020,16 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1264
+#: ../v2v/virt-v2v.pod:1265
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1266
+#: ../v2v/virt-v2v.pod:1267
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1268
+#: ../v2v/virt-v2v.pod:1269
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index fa2d111..707782b 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.59\n"
+"Project-Id-Version: libguestfs 1.27.60\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-07 15:26+0200\n"
+"POT-Creation-Date: 2014-10-08 15:39+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"
@@ -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:443 ../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:443 ../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:445 ../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:445 ../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:226 ../v2v/virt-v2v.pod:508
+#: ../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:226 ../v2v/virt-v2v.pod:509
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:68 ../p2v/virt-p2v-make-kickstart.pod:156 [...]
+#: ../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:68 ../p2v/virt-p2v-make-kickstart.pod:156 [...]
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:236 ../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:236 ../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 ""
@@ -789,7 +789,7 @@ msgid "successful exit, all partitions are aligned E<ge> 64K for best performanc
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286 ../v2v/virt-v2v.pod:969
+#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286 ../v2v/virt-v2v.pod:970
msgid "1"
msgstr ""
@@ -799,7 +799,7 @@ msgid "an error scanning the disk image or guest"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290 ../v2v/virt-v2v.pod:973
+#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290 ../v2v/virt-v2v.pod:974
msgid "2"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod: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:112 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod: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:112 ../p2v/vi [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod: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:92 ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:1181
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../p2v/virt-p2v-make-disk.pod:92 ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642 ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:1182
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:1257 ../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:1257 ../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:3482 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3482 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816 ../test-tool/libguestfs-test-tool.pod [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:489 ../examples/guestfs-faq.pod:716 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:489 ../examples/guestfs-faq.pod:716 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:627 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1829 ../src/guestfs.pod:2101 ../src/guestfs. [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:726 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105 ../src/guestfs. [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:726 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1833 ../src/guestfs.pod:2105 ../src/guestfs. [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:500 ../examples/guestfs-faq.pod:731 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:896 ../v2v/virt-v2v.pod:1156
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:500 ../examples/guestfs-faq.pod:731 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:640 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:897 ../v2v/virt-v2v.pod:1157
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:917
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:918
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:1108
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1109
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:1129
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1130
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -4587,7 +4587,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1204
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1205
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -4599,19 +4599,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1209
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1210
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1212
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1213
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1216
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1217
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -4624,7 +4624,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1223
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1224
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7348,7 +7348,7 @@ msgid "This program returns 0 on success, or 1 if there was an error."
msgstr ""
#. type: textblock
-#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1242
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1243
msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -7474,7 +7474,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72 ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:1167
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72 ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:1168
msgid "FILES"
msgstr ""
@@ -15304,7 +15304,7 @@ msgid "See also: L<guestfs(3)/SSH>."
msgstr ""
#. type: =item
-#: ../fish/guestfish-actions.pod:348 ../src/guestfs-actions.pod:446 ../v2v/virt-v2v.pod:683
+#: ../fish/guestfish-actions.pod:348 ../src/guestfs-actions.pod:446 ../v2v/virt-v2v.pod:684
msgid "C<server>"
msgstr ""
@@ -49420,7 +49420,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1262
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1263
msgid "Matthew Booth"
msgstr ""
@@ -51324,7 +51324,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:1114
+#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:1115
msgid "There are two ways to use this option."
msgstr ""
@@ -51349,26 +51349,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:1136
+#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:1137
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:1139
+#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:1140
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:1145
+#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:1146
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:1148
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:1149
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -51376,7 +51376,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:1152
+#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:1153
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -52192,7 +52192,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1187
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1188
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -52206,7 +52206,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1190
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1191
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 "
@@ -52214,7 +52214,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1194
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1195
msgid "This defaults to C</tmp>."
msgstr ""
@@ -52229,7 +52229,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1202
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1203
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -81495,45 +81495,47 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:486
-msgid "the image directory (I<--vdsm-image-uuid>)"
+msgid ""
+"the image directory of each guest disk (I<--vdsm-image-uuid>) (this option "
+"is passed once for each guest disk)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:491
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:495
+#: ../v2v/virt-v2v.pod:496
msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:500
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:502
+#: ../v2v/virt-v2v.pod:503
msgid "These options can only be used with I<-o vdsm>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:520
+#: ../v2v/virt-v2v.pod:521
msgid ""
"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, "
@@ -81542,12 +81544,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:532
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:534
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 "
@@ -81556,7 +81558,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:539
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -81564,7 +81566,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:543
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -81572,7 +81574,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:545
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -81585,7 +81587,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:551
+#: ../v2v/virt-v2v.pod:552
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -81594,7 +81596,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:554
+#: ../v2v/virt-v2v.pod:555
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -81606,7 +81608,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:561
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -81615,7 +81617,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -81623,19 +81625,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:566
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:568
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:570
+#: ../v2v/virt-v2v.pod:571
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 "
@@ -81643,7 +81645,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:576
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 "
@@ -81651,7 +81653,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -81659,7 +81661,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:583
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -81667,7 +81669,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:585
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -81677,7 +81679,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:589
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -81685,7 +81687,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:590
+#: ../v2v/virt-v2v.pod:591
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -81693,7 +81695,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:593
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -81701,7 +81703,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -81709,7 +81711,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:596
+#: ../v2v/virt-v2v.pod:597
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -81717,7 +81719,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:599
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -81725,7 +81727,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:601
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -81734,12 +81736,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:604
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:606
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 "
@@ -81747,7 +81749,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
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 "
@@ -81757,14 +81759,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
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:619
+#: ../v2v/virt-v2v.pod:620
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -81775,21 +81777,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:624
+#: ../v2v/virt-v2v.pod:625
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:627
+#: ../v2v/virt-v2v.pod:628
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:630
+#: ../v2v/virt-v2v.pod:631
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -81797,12 +81799,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:633
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:635
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -81810,14 +81812,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:636
+#: ../v2v/virt-v2v.pod:637
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:639
+#: ../v2v/virt-v2v.pod:640
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -81828,7 +81830,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:644
+#: ../v2v/virt-v2v.pod:645
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -81836,22 +81838,22 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:647
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:648
+#: ../v2v/virt-v2v.pod:649
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650
+#: ../v2v/virt-v2v.pod:651
msgid "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:653
+#: ../v2v/virt-v2v.pod:654
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 "
@@ -81859,12 +81861,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:657
+#: ../v2v/virt-v2v.pod:658
msgid "ESX: REMOVE VMWARE TOOLS FROM WINDOWS GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:660
msgid ""
"For Windows guests, you should remove VMware tools before conversion. "
"Although this is not strictly necessary, and the guest will still be able to "
@@ -81875,24 +81877,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:666
+#: ../v2v/virt-v2v.pod:667
msgid ""
"This is not necessary for Linux guests, as virt-v2v is able to remove VMware "
"tools."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:670
msgid "ESX: VCENTER URI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:671
+#: ../v2v/virt-v2v.pod:672
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -81900,54 +81902,54 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:675
+#: ../v2v/virt-v2v.pod:676
msgid "where:"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
msgid "C<user@>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:681
+#: ../v2v/virt-v2v.pod:682
msgid "is the (optional, but recommended) user to connect as"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid "is the vCenter Server (I<not> hypervisor)"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:687
+#: ../v2v/virt-v2v.pod:688
msgid "C<Datacenter>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:689
+#: ../v2v/virt-v2v.pod:690
msgid "is the name of the datacenter"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:691
+#: ../v2v/virt-v2v.pod:692
msgid "C<esxi>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:694
msgid "is the name of the ESXi hypervisor running the guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:698
msgid ""
"If the VMware deployment is using clusters and/or folders, then these may "
"need to be added to the URI, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:701
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/cluster1/esxi\n"
@@ -81955,54 +81957,54 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:702
+#: ../v2v/virt-v2v.pod:703
msgid "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:704
+#: ../v2v/virt-v2v.pod:705
msgid "Typical errors from libvirt / virsh when the URI is wrong include:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:710
+#: ../v2v/virt-v2v.pod:711
msgid "Could not find datacenter specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid "Could not find compute resource specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid "Path [...] does not specify a compute resource"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
msgid "Path [...] does not specify a host system"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:726
+#: ../v2v/virt-v2v.pod:727
msgid "Could not find host system specified in [...]"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:730
+#: ../v2v/virt-v2v.pod:731
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:733
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:735
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' list --all\n"
@@ -82011,7 +82013,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:739
#, no-wrap
msgid ""
" Id Name State\n"
@@ -82022,7 +82024,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:743
+#: ../v2v/virt-v2v.pod:744
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 "
@@ -82031,7 +82033,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:748
+#: ../v2v/virt-v2v.pod:749
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' "
@@ -82040,14 +82042,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:750 ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:751 ../v2v/virt-v2v.pod:819
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:754
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' dumpxml "
@@ -82060,7 +82062,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:760
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 "
@@ -82068,17 +82070,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:763
+#: ../v2v/virt-v2v.pod:764
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:765
+#: ../v2v/virt-v2v.pod:766
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:767
+#: ../v2v/virt-v2v.pod:768
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' "
@@ -82089,12 +82091,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:772
msgid "where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:774
+#: ../v2v/virt-v2v.pod:775
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 "
@@ -82102,7 +82104,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:778 ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:779 ../v2v/virt-v2v.pod:843
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 "
@@ -82110,17 +82112,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:782
+#: ../v2v/virt-v2v.pod:783
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:784
+#: ../v2v/virt-v2v.pod:785
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:786
+#: ../v2v/virt-v2v.pod:787
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 "
@@ -82128,33 +82130,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:791
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:793
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:795
+#: ../v2v/virt-v2v.pod:796
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:798
+#: ../v2v/virt-v2v.pod:799
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:801
+#: ../v2v/virt-v2v.pod:802
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -82163,24 +82165,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804
+#: ../v2v/virt-v2v.pod:805
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:808
+#: ../v2v/virt-v2v.pod:809
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:810
+#: ../v2v/virt-v2v.pod:811
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:813
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -82192,7 +82194,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:821
+#: ../v2v/virt-v2v.pod:822
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -82204,7 +82206,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -82212,17 +82214,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:831
+#: ../v2v/virt-v2v.pod:832
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:833
+#: ../v2v/virt-v2v.pod:834
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:835
+#: ../v2v/virt-v2v.pod:836
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -82232,59 +82234,59 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:839
+#: ../v2v/virt-v2v.pod:840
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:846
+#: ../v2v/virt-v2v.pod:847
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:848
+#: ../v2v/virt-v2v.pod:849
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:855
+#: ../v2v/virt-v2v.pod:856
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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:865
+#: ../v2v/virt-v2v.pod:866
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:869
+#: ../v2v/virt-v2v.pod:870
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:876
+#: ../v2v/virt-v2v.pod:877
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:879
+#: ../v2v/virt-v2v.pod:880
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -82292,12 +82294,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:882
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:883
+#: ../v2v/virt-v2v.pod:884
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -82306,17 +82308,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:886
+#: ../v2v/virt-v2v.pod:887
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:890
+#: ../v2v/virt-v2v.pod:891
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:892
+#: ../v2v/virt-v2v.pod:893
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -82326,14 +82328,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:898
+#: ../v2v/virt-v2v.pod:899
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:901
+#: ../v2v/virt-v2v.pod:902
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -82345,7 +82347,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:907
+#: ../v2v/virt-v2v.pod:908
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 "
@@ -82353,7 +82355,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:911
+#: ../v2v/virt-v2v.pod:912
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -82365,12 +82367,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:919
+#: ../v2v/virt-v2v.pod:920
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:921
+#: ../v2v/virt-v2v.pod:922
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -82378,12 +82380,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:925
+#: ../v2v/virt-v2v.pod:926
msgid "OUTPUT TO RHEV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:927
+#: ../v2v/virt-v2v.pod:928
msgid ""
"This section only applies to the I<-o rhev> output mode. If you use "
"virt-v2v from the RHEV-M user interface, then behind the scenes the import "
@@ -82392,7 +82394,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:932
+#: ../v2v/virt-v2v.pod:933
msgid ""
"You have to specify I<-o rhev> and an I<-os> option that points to the "
"RHEV-M Export Storage Domain. You can either specify the NFS server and "
@@ -82403,7 +82405,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:939
+#: ../v2v/virt-v2v.pod:940
msgid ""
"On successful completion virt-v2v will have written the new guest to the "
"Export Storage Domain, but it will not yet be ready to run. It must be "
@@ -82411,7 +82413,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:944
msgid ""
"In RHEV E<ge> 2.2 this is done from the Storage tab. Select the export "
"domain the guest was written to. A pane will appear underneath the storage "
@@ -82421,24 +82423,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:951
msgid ""
"If you export several guests, then you can import them all at the same time "
"through the UI."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:953
+#: ../v2v/virt-v2v.pod:954
msgid "POST-CONVERSION TASKS"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:955
+#: ../v2v/virt-v2v.pod:956
msgid "Guest network configuration"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:957
+#: ../v2v/virt-v2v.pod:958
msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
@@ -82447,29 +82449,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:963
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:964
+#: ../v2v/virt-v2v.pod:965
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:972
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:975
+#: ../v2v/virt-v2v.pod:976
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:980
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -82477,7 +82479,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:984
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -82485,12 +82487,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:988
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:989
+#: ../v2v/virt-v2v.pod:990
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -82498,7 +82500,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:995
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -82510,12 +82512,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1002
+#: ../v2v/virt-v2v.pod:1003
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1004
+#: ../v2v/virt-v2v.pod:1005
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -82523,19 +82525,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1011
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1012
+#: ../v2v/virt-v2v.pod:1013
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1015
+#: ../v2v/virt-v2v.pod:1016
msgid ""
"You can avoid needing root here by mounting it yourself before running "
"virt-v2v, and passing I<-os /mountpoint> instead, but first of all read the "
@@ -82543,12 +82545,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1019
+#: ../v2v/virt-v2v.pod:1020
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1021
+#: ../v2v/virt-v2v.pod:1022
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the "
@@ -82556,7 +82558,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1025
+#: ../v2v/virt-v2v.pod:1026
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as "
@@ -82565,12 +82567,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1031
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1033
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -82578,7 +82580,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1038
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -82586,12 +82588,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1042
+#: ../v2v/virt-v2v.pod:1043
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1044
+#: ../v2v/virt-v2v.pod:1045
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -82599,12 +82601,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1051
+#: ../v2v/virt-v2v.pod:1052
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1054
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -82613,14 +82615,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1059
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1062
+#: ../v2v/virt-v2v.pod:1063
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -82632,19 +82634,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1071
+#: ../v2v/virt-v2v.pod:1072
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1073
+#: ../v2v/virt-v2v.pod:1074
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:1077
+#: ../v2v/virt-v2v.pod:1078
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 "
@@ -82652,7 +82654,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1081
+#: ../v2v/virt-v2v.pod:1082
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -82685,7 +82687,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1110
+#: ../v2v/virt-v2v.pod:1111
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 "
@@ -82693,14 +82695,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1116
+#: ../v2v/virt-v2v.pod:1117
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:1119
+#: ../v2v/virt-v2v.pod:1120
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -82716,7 +82718,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1133
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -82724,7 +82726,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1158
+#: ../v2v/virt-v2v.pod:1159
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 "
@@ -82732,36 +82734,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1164
+#: ../v2v/virt-v2v.pod:1165
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:1171
+#: ../v2v/virt-v2v.pod:1172
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1173 ../v2v/virt-v2v.pod:1227
+#: ../v2v/virt-v2v.pod:1174 ../v2v/virt-v2v.pod:1228
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1175
+#: ../v2v/virt-v2v.pod:1176
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:1185
+#: ../v2v/virt-v2v.pod:1186
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1196
+#: ../v2v/virt-v2v.pod:1197
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 "
@@ -82771,31 +82773,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1206
+#: ../v2v/virt-v2v.pod:1207
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1218
+#: ../v2v/virt-v2v.pod:1219
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1220
+#: ../v2v/virt-v2v.pod:1221
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:1225
+#: ../v2v/virt-v2v.pod:1226
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1229
+#: ../v2v/virt-v2v.pod:1230
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. "
@@ -82805,14 +82807,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1235
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1246
+#: ../v2v/virt-v2v.pod:1247
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)>, "
@@ -82820,16 +82822,16 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1264
+#: ../v2v/virt-v2v.pod:1265
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1266
+#: ../v2v/virt-v2v.pod:1267
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1268
+#: ../v2v/virt-v2v.pod:1269
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index f982299..db01713 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-07 15:26+0200\n"
+"POT-Creation-Date: 2014-10-08 15:39+0200\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -794,7 +794,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:443
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
-#: ../v2v/virt-v2v.pod:504
+#: ../v2v/virt-v2v.pod:505
msgid "B<-v>"
msgstr "B<-v>"
@@ -809,7 +809,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:445
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:507
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:226
-#: ../v2v/virt-v2v.pod:508
+#: ../v2v/virt-v2v.pod:509
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -840,7 +840,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../p2v/virt-p2v.pod:449 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:510
+#: ../v2v/virt-v2v.pod:511
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:230 ../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:512
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:513
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:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:514
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:515
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:234 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:525
+#: ../v2v/virt-v2v.pod:526
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:236
-#: ../v2v/virt-v2v.pod:527
+#: ../v2v/virt-v2v.pod:528
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1375,10 +1375,10 @@ msgstr "Ця програма повертає:"
#: ../sysprep/virt-sysprep.pod:414 ../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:484 ../v2v/virt-v2v.pod:488
-#: ../v2v/virt-v2v.pod:493 ../v2v/virt-v2v.pod:708 ../v2v/virt-v2v.pod:712
-#: ../v2v/virt-v2v.pod:716 ../v2v/virt-v2v.pod:720 ../v2v/virt-v2v.pod:724
-#: ../v2v/virt-v2v.pod:853 ../v2v/virt-v2v.pod:858 ../v2v/virt-v2v.pod:863
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:484 ../v2v/virt-v2v.pod:489
+#: ../v2v/virt-v2v.pod:494 ../v2v/virt-v2v.pod:709 ../v2v/virt-v2v.pod:713
+#: ../v2v/virt-v2v.pod:717 ../v2v/virt-v2v.pod:721 ../v2v/virt-v2v.pod:725
+#: ../v2v/virt-v2v.pod:854 ../v2v/virt-v2v.pod:859 ../v2v/virt-v2v.pod:864
msgid "*"
msgstr "*"
@@ -1397,7 +1397,7 @@ msgstr ""
#. type: =item
#: ../align/virt-alignment-scan.pod:364 ../src/guestfs.pod:2286
-#: ../v2v/virt-v2v.pod:969
+#: ../v2v/virt-v2v.pod:970
msgid "1"
msgstr "1"
@@ -1408,7 +1408,7 @@ msgstr "під час сканування образу диска або гос
#. type: =item
#: ../align/virt-alignment-scan.pod:370 ../src/guestfs.pod:2290
-#: ../v2v/virt-v2v.pod:973
+#: ../v2v/virt-v2v.pod:974
msgid "2"
msgstr "2"
@@ -1458,7 +1458,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4750
#: ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1244
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:1245
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1498,7 +1498,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1260
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:1261
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1529,7 +1529,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4814
#: ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1270
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:1271
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1846,7 +1846,7 @@ msgstr ""
#: ../p2v/virt-p2v-make-kickstart.pod:176 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4642
#: ../sysprep/virt-sysprep.pod:521 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:1181
+#: ../v2v/virt-v2v.pod:1182
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1885,7 +1885,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4810
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:1258
+#: ../v2v/virt-v2v.pod:1259
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1916,7 +1916,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:596
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4816
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
-#: ../v2v/virt-v2v.pod:1272
+#: ../v2v/virt-v2v.pod:1273
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2907,8 +2907,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:1829 ../src/guestfs.pod:2101
-#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:874
-#: ../v2v/virt-v2v.pod:1143
+#: ../src/guestfs.pod:2399 ../src/guestfs.pod:3892 ../v2v/virt-v2v.pod:875
+#: ../v2v/virt-v2v.pod:1144
msgid "1."
msgstr "1."
@@ -2927,8 +2927,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:1833 ../src/guestfs.pod:2105
-#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:888
-#: ../v2v/virt-v2v.pod:1150
+#: ../src/guestfs.pod:2403 ../src/guestfs.pod:3917 ../v2v/virt-v2v.pod:889
+#: ../v2v/virt-v2v.pod:1151
msgid "2."
msgstr "2."
@@ -2946,8 +2946,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:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:896
-#: ../v2v/virt-v2v.pod:1156
+#: ../src/guestfs.pod:1837 ../src/guestfs.pod:2409 ../v2v/virt-v2v.pod:897
+#: ../v2v/virt-v2v.pod:1157
msgid "3."
msgstr "3."
@@ -2962,7 +2962,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:917
+#: ../v2v/virt-v2v.pod:918
msgid "4."
msgstr "4."
@@ -5515,7 +5515,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:599
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1108
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:1109
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5550,7 +5550,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:617
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1129
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:1130
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5599,7 +5599,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1204
+#: ../sysprep/virt-sysprep.pod:525 ../v2v/virt-v2v.pod:1205
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5613,7 +5613,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1209
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:1210
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5621,13 +5621,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1212
+#: ../sysprep/virt-sysprep.pod:533 ../v2v/virt-v2v.pod:1213
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1216
+#: ../sysprep/virt-sysprep.pod:537 ../v2v/virt-v2v.pod:1217
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5642,7 +5642,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1223
+#: ../sysprep/virt-sysprep.pod:543 ../v2v/virt-v2v.pod:1224
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8715,7 +8715,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1242
+#: ../sysprep/virt-sysprep.pod:549 ../v2v/virt-v2v.pod:1243
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8851,7 +8851,7 @@ msgstr ""
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../p2v/virt-p2v-make-disk.pod:72
#: ../p2v/virt-p2v-make-kickstart.pod:160 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:1167
+#: ../v2v/virt-v2v.pod:1168
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -17375,7 +17375,7 @@ msgstr "Див. також L<guestfs(3)/SSH>."
#. type: =item
#: ../fish/guestfish-actions.pod:348 ../src/guestfs-actions.pod:446
-#: ../v2v/virt-v2v.pod:683
+#: ../v2v/virt-v2v.pod:684
msgid "C<server>"
msgstr "C<server>"
@@ -52892,7 +52892,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1262
+#: ../p2v/virt-p2v.pod:592 ../v2v/virt-v2v.pod:1263
msgid "Matthew Booth"
msgstr ""
@@ -54902,7 +54902,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:605 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:1114
+#: ../v2v/virt-v2v.pod:1115
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -54935,7 +54935,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:620 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:1136
+#: ../v2v/virt-v2v.pod:1137
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -54943,13 +54943,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:1139
+#: ../v2v/virt-v2v.pod:1140
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:629 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:1145
+#: ../v2v/virt-v2v.pod:1146
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -54957,7 +54957,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:1148
+#: ../v2v/virt-v2v.pod:1149
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -54968,7 +54968,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:1152
+#: ../v2v/virt-v2v.pod:1153
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -55820,7 +55820,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1187
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:1188
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -55834,7 +55834,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1190
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:1191
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 "
@@ -55842,7 +55842,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1194
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:1195
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -55857,7 +55857,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1202
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:1203
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -89730,45 +89730,47 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:486
-msgid "the image directory (I<--vdsm-image-uuid>)"
+msgid ""
+"the image directory of each guest disk (I<--vdsm-image-uuid>) (this option "
+"is passed once for each guest disk)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:490
+#: ../v2v/virt-v2v.pod:491
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:495
+#: ../v2v/virt-v2v.pod:496
msgid "the VM and OVF file (I<--vdsm-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:499
+#: ../v2v/virt-v2v.pod:500
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:502
+#: ../v2v/virt-v2v.pod:503
msgid "These options can only be used with I<-o vdsm>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:520
+#: ../v2v/virt-v2v.pod:521
msgid ""
"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, "
@@ -89777,12 +89779,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:531
+#: ../v2v/virt-v2v.pod:532
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:533
+#: ../v2v/virt-v2v.pod:534
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 "
@@ -89791,7 +89793,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:538
+#: ../v2v/virt-v2v.pod:539
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -89799,7 +89801,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:542
+#: ../v2v/virt-v2v.pod:543
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -89807,7 +89809,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:544
+#: ../v2v/virt-v2v.pod:545
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -89820,7 +89822,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:551
+#: ../v2v/virt-v2v.pod:552
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -89829,7 +89831,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:554
+#: ../v2v/virt-v2v.pod:555
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -89841,7 +89843,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:560
+#: ../v2v/virt-v2v.pod:561
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -89850,7 +89852,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -89858,19 +89860,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:565
+#: ../v2v/virt-v2v.pod:566
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:567
+#: ../v2v/virt-v2v.pod:568
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:570
+#: ../v2v/virt-v2v.pod:571
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 "
@@ -89878,7 +89880,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:575
+#: ../v2v/virt-v2v.pod:576
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 "
@@ -89886,7 +89888,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:580
+#: ../v2v/virt-v2v.pod:581
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -89894,7 +89896,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:582
+#: ../v2v/virt-v2v.pod:583
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -89902,7 +89904,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:584
+#: ../v2v/virt-v2v.pod:585
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -89912,7 +89914,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:588
+#: ../v2v/virt-v2v.pod:589
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -89920,7 +89922,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:590
+#: ../v2v/virt-v2v.pod:591
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -89928,7 +89930,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:592
+#: ../v2v/virt-v2v.pod:593
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -89936,7 +89938,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -89944,7 +89946,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:596
+#: ../v2v/virt-v2v.pod:597
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -89952,7 +89954,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:598
+#: ../v2v/virt-v2v.pod:599
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -89960,7 +89962,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:600
+#: ../v2v/virt-v2v.pod:601
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -89969,12 +89971,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:603
+#: ../v2v/virt-v2v.pod:604
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:605
+#: ../v2v/virt-v2v.pod:606
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 "
@@ -89982,7 +89984,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
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 "
@@ -89992,14 +89994,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
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:619
+#: ../v2v/virt-v2v.pod:620
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -90010,21 +90012,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:624
+#: ../v2v/virt-v2v.pod:625
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:627
+#: ../v2v/virt-v2v.pod:628
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:630
+#: ../v2v/virt-v2v.pod:631
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -90032,12 +90034,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:632
+#: ../v2v/virt-v2v.pod:633
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:634
+#: ../v2v/virt-v2v.pod:635
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -90045,14 +90047,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:636
+#: ../v2v/virt-v2v.pod:637
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:639
+#: ../v2v/virt-v2v.pod:640
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -90063,7 +90065,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:644
+#: ../v2v/virt-v2v.pod:645
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -90071,23 +90073,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:647
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:648
+#: ../v2v/virt-v2v.pod:649
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:650
+#: ../v2v/virt-v2v.pod:651
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:653
+#: ../v2v/virt-v2v.pod:654
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 "
@@ -90095,12 +90097,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:657
+#: ../v2v/virt-v2v.pod:658
msgid "ESX: REMOVE VMWARE TOOLS FROM WINDOWS GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:659
+#: ../v2v/virt-v2v.pod:660
msgid ""
"For Windows guests, you should remove VMware tools before conversion. "
"Although this is not strictly necessary, and the guest will still be able to "
@@ -90111,24 +90113,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:666
+#: ../v2v/virt-v2v.pod:667
msgid ""
"This is not necessary for Linux guests, as virt-v2v is able to remove VMware "
"tools."
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:669
+#: ../v2v/virt-v2v.pod:670
msgid "ESX: VCENTER URI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:671
+#: ../v2v/virt-v2v.pod:672
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -90136,54 +90138,54 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:675
+#: ../v2v/virt-v2v.pod:676
msgid "where:"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
msgid "C<user@>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:681
+#: ../v2v/virt-v2v.pod:682
msgid "is the (optional, but recommended) user to connect as"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid "is the vCenter Server (I<not> hypervisor)"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:687
+#: ../v2v/virt-v2v.pod:688
msgid "C<Datacenter>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:689
+#: ../v2v/virt-v2v.pod:690
msgid "is the name of the datacenter"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:691
+#: ../v2v/virt-v2v.pod:692
msgid "C<esxi>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:693
+#: ../v2v/virt-v2v.pod:694
msgid "is the name of the ESXi hypervisor running the guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:697
+#: ../v2v/virt-v2v.pod:698
msgid ""
"If the VMware deployment is using clusters and/or folders, then these may "
"need to be added to the URI, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:700
+#: ../v2v/virt-v2v.pod:701
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/cluster1/esxi\n"
@@ -90191,55 +90193,55 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:702
+#: ../v2v/virt-v2v.pod:703
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:704
+#: ../v2v/virt-v2v.pod:705
msgid "Typical errors from libvirt / virsh when the URI is wrong include:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:710
+#: ../v2v/virt-v2v.pod:711
msgid "Could not find datacenter specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid "Could not find compute resource specified in [...]"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid "Path [...] does not specify a compute resource"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
msgid "Path [...] does not specify a host system"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:726
+#: ../v2v/virt-v2v.pod:727
msgid "Could not find host system specified in [...]"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:730
+#: ../v2v/virt-v2v.pod:731
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:732
+#: ../v2v/virt-v2v.pod:733
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:735
+#: ../v2v/virt-v2v.pod:736
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' list --all\n"
@@ -90248,7 +90250,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:738
+#: ../v2v/virt-v2v.pod:739
#, no-wrap
msgid ""
" Id Name State\n"
@@ -90259,7 +90261,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:743
+#: ../v2v/virt-v2v.pod:744
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 "
@@ -90268,7 +90270,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:748
+#: ../v2v/virt-v2v.pod:749
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -90276,14 +90278,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:750 ../v2v/virt-v2v.pod:818
+#: ../v2v/virt-v2v.pod:751 ../v2v/virt-v2v.pod:819
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:753
+#: ../v2v/virt-v2v.pod:754
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@vcenter.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -90295,7 +90297,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:759
+#: ../v2v/virt-v2v.pod:760
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 "
@@ -90303,17 +90305,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:763
+#: ../v2v/virt-v2v.pod:764
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:765
+#: ../v2v/virt-v2v.pod:766
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:767
+#: ../v2v/virt-v2v.pod:768
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -90323,13 +90325,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:771
+#: ../v2v/virt-v2v.pod:772
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:774
+#: ../v2v/virt-v2v.pod:775
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 "
@@ -90337,7 +90339,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:778 ../v2v/virt-v2v.pod:842
+#: ../v2v/virt-v2v.pod:779 ../v2v/virt-v2v.pod:843
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 "
@@ -90345,17 +90347,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:782
+#: ../v2v/virt-v2v.pod:783
msgid "INPUT FROM RHEL 5 XEN"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:784
+#: ../v2v/virt-v2v.pod:785
msgid "Virt-v2v is able to import Xen guests from RHEL 5 Xen hosts."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:786
+#: ../v2v/virt-v2v.pod:787
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 "
@@ -90363,33 +90365,33 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:790
+#: ../v2v/virt-v2v.pod:791
msgid "XEN: SET UP SSH-AGENT ACCESS TO XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:792
+#: ../v2v/virt-v2v.pod:793
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:795
+#: ../v2v/virt-v2v.pod:796
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:798
+#: ../v2v/virt-v2v.pod:799
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:801
+#: ../v2v/virt-v2v.pod:802
#, no-wrap
msgid ""
" $ ssh root at xen.example.com\n"
@@ -90398,24 +90400,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804
+#: ../v2v/virt-v2v.pod:805
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:808
+#: ../v2v/virt-v2v.pod:809
msgid "XEN: TEST LIBVIRT CONNECTION TO REMOTE XEN HOST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:810
+#: ../v2v/virt-v2v.pod:811
msgid "Use the L<virsh(1)> command to list the guests on the remote Xen host:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:812
+#: ../v2v/virt-v2v.pod:813
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com list --all\n"
@@ -90427,7 +90429,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:821
+#: ../v2v/virt-v2v.pod:822
#, no-wrap
msgid ""
" $ virsh -c xen+ssh://root@xen.example.com dumpxml rhel49-x86_64-pv\n"
@@ -90439,7 +90441,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -90447,17 +90449,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:831
+#: ../v2v/virt-v2v.pod:832
msgid "XEN: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:833
+#: ../v2v/virt-v2v.pod:834
msgid "To import a particular guest from a Xen server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:835
+#: ../v2v/virt-v2v.pod:836
#, no-wrap
msgid ""
" $ virt-v2v -ic 'xen+ssh://root@xen.example.com' \\\n"
@@ -90467,58 +90469,58 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:839
+#: ../v2v/virt-v2v.pod:840
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:846
+#: ../v2v/virt-v2v.pod:847
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:848
+#: ../v2v/virt-v2v.pod:849
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:855
+#: ../v2v/virt-v2v.pod:856
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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:865
+#: ../v2v/virt-v2v.pod:866
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:869
+#: ../v2v/virt-v2v.pod:870
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:876
+#: ../v2v/virt-v2v.pod:877
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:879
+#: ../v2v/virt-v2v.pod:880
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -90526,12 +90528,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:881
+#: ../v2v/virt-v2v.pod:882
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:883
+#: ../v2v/virt-v2v.pod:884
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -90540,17 +90542,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:886
+#: ../v2v/virt-v2v.pod:887
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:890
+#: ../v2v/virt-v2v.pod:891
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:892
+#: ../v2v/virt-v2v.pod:893
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -90560,14 +90562,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:898
+#: ../v2v/virt-v2v.pod:899
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:901
+#: ../v2v/virt-v2v.pod:902
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -90579,7 +90581,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:907
+#: ../v2v/virt-v2v.pod:908
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 "
@@ -90587,7 +90589,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:911
+#: ../v2v/virt-v2v.pod:912
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -90599,12 +90601,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:919
+#: ../v2v/virt-v2v.pod:920
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:921
+#: ../v2v/virt-v2v.pod:922
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -90612,12 +90614,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:925
+#: ../v2v/virt-v2v.pod:926
msgid "OUTPUT TO RHEV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:927
+#: ../v2v/virt-v2v.pod:928
msgid ""
"This section only applies to the I<-o rhev> output mode. If you use virt-"
"v2v from the RHEV-M user interface, then behind the scenes the import is "
@@ -90626,7 +90628,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:932
+#: ../v2v/virt-v2v.pod:933
msgid ""
"You have to specify I<-o rhev> and an I<-os> option that points to the RHEV-"
"M Export Storage Domain. You can either specify the NFS server and "
@@ -90637,7 +90639,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:939
+#: ../v2v/virt-v2v.pod:940
msgid ""
"On successful completion virt-v2v will have written the new guest to the "
"Export Storage Domain, but it will not yet be ready to run. It must be "
@@ -90645,7 +90647,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:943
+#: ../v2v/virt-v2v.pod:944
msgid ""
"In RHEV E<ge> 2.2 this is done from the Storage tab. Select the export "
"domain the guest was written to. A pane will appear underneath the storage "
@@ -90655,24 +90657,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:950
+#: ../v2v/virt-v2v.pod:951
msgid ""
"If you export several guests, then you can import them all at the same time "
"through the UI."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:953
+#: ../v2v/virt-v2v.pod:954
msgid "POST-CONVERSION TASKS"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:955
+#: ../v2v/virt-v2v.pod:956
msgid "Guest network configuration"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:957
+#: ../v2v/virt-v2v.pod:958
msgid ""
"Virt-v2v cannot currently reconfigure a guest's network configuration. If "
"the converted guest is not connected to the same subnet as the source, its "
@@ -90680,29 +90682,29 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:962
+#: ../v2v/virt-v2v.pod:963
msgid "Converting a Windows guest"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:964
+#: ../v2v/virt-v2v.pod:965
msgid ""
"When converting a Windows guests, the conversion process is split into two "
"stages:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:971
+#: ../v2v/virt-v2v.pod:972
msgid "Offline conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:975
+#: ../v2v/virt-v2v.pod:976
msgid "First boot."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:979
+#: ../v2v/virt-v2v.pod:980
msgid ""
"The guest will be bootable after the offline conversion stage, but will not "
"yet have all necessary drivers installed to work correctly. These will be "
@@ -90710,7 +90712,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:983
+#: ../v2v/virt-v2v.pod:984
msgid ""
"B<N.B.> Take care not to interrupt the automatic driver installation process "
"when logging in to the guest for the first time, as this may prevent the "
@@ -90718,12 +90720,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:987
+#: ../v2v/virt-v2v.pod:988
msgid "Windows Recovery Console"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:989
+#: ../v2v/virt-v2v.pod:990
msgid ""
"Virt-v2v does not support conversion of the Windows Recovery Console. If a "
"guest has a recovery console installed and VirtIO was enabled during "
@@ -90731,7 +90733,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:994
+#: ../v2v/virt-v2v.pod:995
msgid ""
"Windows XP x86 does not support the Windows Recovery Console on VirtIO "
"systems, so there is no resolution to this. However, on Windows XP AMD64 "
@@ -90743,12 +90745,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1002
+#: ../v2v/virt-v2v.pod:1003
msgid "RUNNING VIRT-V2V AS ROOT OR NON-ROOT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1004
+#: ../v2v/virt-v2v.pod:1005
msgid ""
"Nothing in virt-v2v inherently needs root access, and it will run just fine "
"as a non-root user. However, certain external features may require either "
@@ -90756,19 +90758,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1010
+#: ../v2v/virt-v2v.pod:1011
msgid "Mounting the Export Storage Domain"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1012
+#: ../v2v/virt-v2v.pod:1013
msgid ""
"When using I<-o rhev -os server:/esd> virt-v2v has to have sufficient "
"privileges to NFS mount the Export Storage Domain from C<server>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1015
+#: ../v2v/virt-v2v.pod:1016
msgid ""
"You can avoid needing root here by mounting it yourself before running virt-"
"v2v, and passing I<-os /mountpoint> instead, but first of all read the next "
@@ -90776,12 +90778,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1019
+#: ../v2v/virt-v2v.pod:1020
msgid "Writing to the Export Storage Domain as 36:36"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1021
+#: ../v2v/virt-v2v.pod:1022
msgid ""
"RHEV-M cannot read files and directories from the Export Storage Domain "
"unless they have UID:GID 36:36. You will see VM import problems if the UID:"
@@ -90789,7 +90791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1025
+#: ../v2v/virt-v2v.pod:1026
msgid ""
"When you run virt-v2v I<-o rhev> as root, virt-v2v attempts to create files "
"and directories with the correct ownership. If you run virt-v2v as non-"
@@ -90798,12 +90800,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1030
+#: ../v2v/virt-v2v.pod:1031
msgid "Writing to libvirt"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1032
+#: ../v2v/virt-v2v.pod:1033
msgid ""
"When using I<-o libvirt>, you may need to run virt-v2v as root so that it "
"can write to the libvirt system instance (ie. C<qemu:///system>) and to the "
@@ -90811,7 +90813,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1037
+#: ../v2v/virt-v2v.pod:1038
msgid ""
"You can avoid this by setting up libvirt connection authentication, see "
"L<http://libvirt.org/auth.html>. Alternatively, use I<-oc qemu:///session>, "
@@ -90819,12 +90821,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:1042
+#: ../v2v/virt-v2v.pod:1043
msgid "Writing to Glance"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1044
+#: ../v2v/virt-v2v.pod:1045
msgid ""
"This does I<not> need root (in fact it probably won't work), but may require "
"either a special user and/or for you to source a script that sets "
@@ -90832,12 +90834,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1051
+#: ../v2v/virt-v2v.pod:1052
msgid "DEBUGGING RHEV-M IMPORT FAILURES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1053
+#: ../v2v/virt-v2v.pod:1054
msgid ""
"When you export to the RHEV-M Export Storage Domain, and then import that "
"guest through the RHEV-M UI, you may encounter an import failure. "
@@ -90846,14 +90848,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1058
+#: ../v2v/virt-v2v.pod:1059
msgid ""
"There are two log files of interest. The first is stored on the RHEV-M "
"server itself, and is called C</var/log/ovirt-engine/engine.log>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1062
+#: ../v2v/virt-v2v.pod:1063
msgid ""
"The second file, which is the most useful, is found on the SPM host (SPM "
"stands for \"Storage Pool Manager\"). This is a RHEV node that is elected "
@@ -90865,19 +90867,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:1071
+#: ../v2v/virt-v2v.pod:1072
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1073
+#: ../v2v/virt-v2v.pod:1074
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:1077
+#: ../v2v/virt-v2v.pod:1078
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 "
@@ -90885,7 +90887,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:1081
+#: ../v2v/virt-v2v.pod:1082
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -90918,7 +90920,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1110
+#: ../v2v/virt-v2v.pod:1111
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 "
@@ -90926,14 +90928,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1116
+#: ../v2v/virt-v2v.pod:1117
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:1119
+#: ../v2v/virt-v2v.pod:1120
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -90949,7 +90951,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1132
+#: ../v2v/virt-v2v.pod:1133
msgid ""
"The C<input:> and C<output:> features refer to I<-i> and I<-o> (input and "
"output mode) options supported by this binary. The C<convert:> features "
@@ -90957,7 +90959,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1158
+#: ../v2v/virt-v2v.pod:1159
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 "
@@ -90965,36 +90967,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1164
+#: ../v2v/virt-v2v.pod:1165
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:1171
+#: ../v2v/virt-v2v.pod:1172
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1173 ../v2v/virt-v2v.pod:1227
+#: ../v2v/virt-v2v.pod:1174 ../v2v/virt-v2v.pod:1228
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1175
+#: ../v2v/virt-v2v.pod:1176
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:1185
+#: ../v2v/virt-v2v.pod:1186
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1196
+#: ../v2v/virt-v2v.pod:1197
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 "
@@ -91004,31 +91006,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1206
+#: ../v2v/virt-v2v.pod:1207
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1218
+#: ../v2v/virt-v2v.pod:1219
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1220
+#: ../v2v/virt-v2v.pod:1221
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:1225
+#: ../v2v/virt-v2v.pod:1226
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1229
+#: ../v2v/virt-v2v.pod:1230
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. "
@@ -91038,14 +91040,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1235
+#: ../v2v/virt-v2v.pod:1236
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1246
+#: ../v2v/virt-v2v.pod:1247
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)>, "
@@ -91053,16 +91055,16 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1264
+#: ../v2v/virt-v2v.pod:1265
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1266
+#: ../v2v/virt-v2v.pod:1267
msgid "Shahar Havivi"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:1268
+#: ../v2v/virt-v2v.pod:1269
msgid "Tingting Zheng"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index e8b460f..9c3c696 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 62b2d83..75ec449 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,7 +67,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -93,7 +93,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -230,7 +230,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -280,7 +280,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -607,19 +607,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -656,19 +656,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -676,19 +676,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -705,47 +705,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -787,7 +789,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -942,11 +944,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -998,7 +1000,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1036,7 +1038,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1079,7 +1081,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1090,7 +1092,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1150,7 +1152,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1263,11 +1265,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1293,7 +1295,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1317,7 +1319,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1325,7 +1327,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1340,7 +1342,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1349,7 +1351,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1357,11 +1359,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1432,7 +1434,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1448,15 +1450,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1499,11 +1501,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1690,7 +1692,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1758,7 +1760,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1798,7 +1800,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1828,7 +1830,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1840,15 +1842,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1896,7 +1898,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2282,7 +2284,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2292,7 +2294,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2479,7 +2481,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2487,31 +2489,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2523,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2589,7 +2591,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2601,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2621,7 +2623,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2629,7 +2631,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2847,10 +2849,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2929,23 +2932,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 5ba4fb3..c0ac81c 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,7 +66,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -279,7 +279,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -606,19 +606,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -655,19 +655,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -675,19 +675,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -704,47 +704,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -786,7 +788,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -941,11 +943,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -997,7 +999,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1078,7 +1080,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1089,7 +1091,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1149,7 +1151,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1262,11 +1264,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1292,7 +1294,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1316,7 +1318,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1324,7 +1326,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1339,7 +1341,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1348,7 +1350,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1356,11 +1358,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1431,7 +1433,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1447,15 +1449,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1498,11 +1500,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1689,7 +1691,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1757,7 +1759,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1797,7 +1799,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1827,7 +1829,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1839,15 +1841,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1895,7 +1897,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2281,7 +2283,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2291,7 +2293,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2478,7 +2480,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2486,31 +2488,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2522,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2588,7 +2590,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2600,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2620,7 +2622,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2628,7 +2630,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2846,10 +2848,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2928,23 +2931,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 343515c..3b53cfb 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,7 +66,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -279,7 +279,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -606,19 +606,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -655,19 +655,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -675,19 +675,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -704,47 +704,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -786,7 +788,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -941,11 +943,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -997,7 +999,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1078,7 +1080,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1089,7 +1091,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1149,7 +1151,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1262,11 +1264,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1292,7 +1294,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1316,7 +1318,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1324,7 +1326,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1339,7 +1341,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1348,7 +1350,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1356,11 +1358,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1431,7 +1433,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1447,15 +1449,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1498,11 +1500,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1689,7 +1691,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1757,7 +1759,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1797,7 +1799,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1827,7 +1829,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1839,15 +1841,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1895,7 +1897,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2281,7 +2283,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2291,7 +2293,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2478,7 +2480,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2486,31 +2488,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2522,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2588,7 +2590,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2600,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2620,7 +2622,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2628,7 +2630,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2846,10 +2848,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2928,23 +2931,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 80346f7..720483f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 3b06dda..1d63467 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.59\n"
+"Project-Id-Version: libguestfs 1.27.60\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 15:26+0100\n"
+"POT-Creation-Date: 2014-10-08 15:42+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"
@@ -64,7 +64,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -90,7 +90,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -100,7 +100,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -227,7 +227,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -277,7 +277,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -604,19 +604,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -653,19 +653,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -673,19 +673,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -702,47 +702,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -784,7 +786,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -939,11 +941,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -995,7 +997,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1033,7 +1035,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1076,7 +1078,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1087,7 +1089,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1147,7 +1149,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1260,11 +1262,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1290,7 +1292,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1314,7 +1316,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1322,7 +1324,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1337,7 +1339,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1346,7 +1348,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1354,11 +1356,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1429,7 +1431,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1445,15 +1447,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1496,11 +1498,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1687,7 +1689,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1755,7 +1757,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1795,7 +1797,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1825,7 +1827,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1837,15 +1839,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1893,7 +1895,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2279,7 +2281,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2289,7 +2291,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2476,7 +2478,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2484,31 +2486,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2520,7 +2522,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2586,7 +2588,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2598,15 +2600,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2618,7 +2620,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2626,7 +2628,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2844,10 +2846,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2926,23 +2929,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 22231b4..58b37bc 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 6547728..aca6365 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,7 +66,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -279,7 +279,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -606,19 +606,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -655,19 +655,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -675,19 +675,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -704,47 +704,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -786,7 +788,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -941,11 +943,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -997,7 +999,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1078,7 +1080,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1089,7 +1091,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1149,7 +1151,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1262,11 +1264,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1292,7 +1294,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1316,7 +1318,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1324,7 +1326,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1339,7 +1341,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1348,7 +1350,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1356,11 +1358,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1431,7 +1433,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1447,15 +1449,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1498,11 +1500,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1689,7 +1691,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1757,7 +1759,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1797,7 +1799,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1827,7 +1829,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1839,15 +1841,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1895,7 +1897,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2281,7 +2283,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2291,7 +2293,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2478,7 +2480,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2486,31 +2488,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2522,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2588,7 +2590,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2600,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2620,7 +2622,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2628,7 +2630,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2846,10 +2848,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2928,23 +2931,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2dc31f1..b7050ad 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,7 +67,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -93,7 +93,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -230,7 +230,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -280,7 +280,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -607,19 +607,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -656,19 +656,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -676,19 +676,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -705,47 +705,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -787,7 +789,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -942,11 +944,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -998,7 +1000,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1036,7 +1038,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1079,7 +1081,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1090,7 +1092,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1150,7 +1152,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1263,11 +1265,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1293,7 +1295,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1317,7 +1319,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1325,7 +1327,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1340,7 +1342,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1349,7 +1351,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1357,11 +1359,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1432,7 +1434,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1448,15 +1450,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1499,11 +1501,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1690,7 +1692,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1758,7 +1760,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1798,7 +1800,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1828,7 +1830,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1840,15 +1842,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1896,7 +1898,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2282,7 +2284,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2292,7 +2294,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2479,7 +2481,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2487,31 +2489,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2523,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2589,7 +2591,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2601,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2621,7 +2623,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2629,7 +2631,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2847,10 +2849,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2929,23 +2932,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/or.po b/po/or.po
index 85180dc..12db9b1 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index c1e9987..62fa1b1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -66,7 +66,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -229,7 +229,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -279,7 +279,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -606,19 +606,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -655,19 +655,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -675,19 +675,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -704,47 +704,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -786,7 +788,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -941,11 +943,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -997,7 +999,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1035,7 +1037,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1078,7 +1080,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1089,7 +1091,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1149,7 +1151,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1262,11 +1264,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1292,7 +1294,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1316,7 +1318,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1324,7 +1326,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1339,7 +1341,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1348,7 +1350,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1356,11 +1358,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1431,7 +1433,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1447,15 +1449,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1498,11 +1500,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1689,7 +1691,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1757,7 +1759,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1797,7 +1799,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1827,7 +1829,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1839,15 +1841,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1895,7 +1897,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2281,7 +2283,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2291,7 +2293,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2478,7 +2480,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2486,31 +2488,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2522,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2588,7 +2590,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2600,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2620,7 +2622,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2628,7 +2630,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2846,10 +2848,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2928,23 +2931,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 69a04d6..5787fe7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -95,7 +95,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -105,7 +105,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -117,7 +117,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -232,7 +232,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -282,7 +282,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -546,7 +546,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -609,19 +609,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -658,19 +658,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -678,19 +678,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -707,47 +707,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -789,7 +791,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -944,11 +946,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -1000,7 +1002,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1038,7 +1040,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1081,7 +1083,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1092,7 +1094,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1152,7 +1154,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1265,11 +1267,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1295,7 +1297,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1319,7 +1321,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1327,7 +1329,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1342,7 +1344,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1351,7 +1353,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1359,11 +1361,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1434,7 +1436,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1450,15 +1452,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1501,11 +1503,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1692,7 +1694,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1760,7 +1762,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1800,7 +1802,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1830,7 +1832,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1842,15 +1844,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1898,7 +1900,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2284,7 +2286,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2294,7 +2296,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2481,7 +2483,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2489,31 +2491,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2525,7 +2527,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2591,7 +2593,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2603,15 +2605,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2623,7 +2625,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2631,7 +2633,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2849,10 +2851,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2931,23 +2934,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 102c65a..83394a7 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/te.po b/po/te.po
index d3d89e3..5258348 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,7 +65,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -605,19 +605,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -654,19 +654,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -674,19 +674,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -703,47 +703,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -785,7 +787,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -940,11 +942,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -996,7 +998,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1034,7 +1036,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1077,7 +1079,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1088,7 +1090,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1148,7 +1150,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1261,11 +1263,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1291,7 +1293,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1323,7 +1325,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1338,7 +1340,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1347,7 +1349,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1355,11 +1357,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1430,7 +1432,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1446,15 +1448,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1497,11 +1499,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1688,7 +1690,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1756,7 +1758,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1796,7 +1798,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1826,7 +1828,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1838,15 +1840,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1894,7 +1896,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2280,7 +2282,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2290,7 +2292,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2477,7 +2479,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2485,31 +2487,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2587,7 +2589,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2599,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2619,7 +2621,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2627,7 +2629,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2845,10 +2847,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2927,23 +2930,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %s"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 3e0e4da..489f76d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-07 13:30+0100\n"
+"POT-Creation-Date: 2014-10-08 15:38+0100\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,7 +67,7 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:266
+#: ../mllib/common_utils.ml:272
msgid "%s"
msgstr ""
@@ -93,7 +93,7 @@ msgid ""
"this out through the RHEV-M user interface."
msgstr ""
-#: ../v2v/cmdline.ml:101 ../v2v/cmdline.ml:57
+#: ../v2v/cmdline.ml:100 ../v2v/cmdline.ml:56
msgid "%s option used more than once on the command line"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:262
+#: ../mllib/common_utils.ml:268
msgid "%s: %s"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:264
+#: ../mllib/common_utils.ml:270
msgid "%s: %s: %s"
msgstr ""
@@ -230,7 +230,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:187
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -280,7 +280,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:233
+#: ../mllib/common_utils.ml:239
msgid "%s: error: %s"
msgstr ""
@@ -544,7 +544,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:249
+#: ../mllib/common_utils.ml:255
msgid "%s: warning: %s"
msgstr ""
@@ -607,19 +607,19 @@ msgstr ""
msgid "--format parameter must appear before -a parameter"
msgstr ""
-#: ../v2v/cmdline.ml:309
+#: ../v2v/cmdline.ml:311
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:321
+#: ../v2v/cmdline.ml:323
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:93
msgid "--no-trim: %s: mountpoint does not begin with '/'"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:91
msgid "--no-trim: empty mountpoint"
msgstr ""
@@ -656,19 +656,19 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:307
+#: ../v2v/cmdline.ml:309
msgid "--vmtype option cannot be used with '-o glance'"
msgstr ""
-#: ../v2v/cmdline.ml:319
+#: ../v2v/cmdline.ml:321
msgid "--vmtype option cannot be used with '-o libvirt'"
msgstr ""
-#: ../v2v/cmdline.ml:333
+#: ../v2v/cmdline.ml:335
msgid "--vmtype option cannot be used with '-o local'"
msgstr ""
-#: ../v2v/cmdline.ml:344
+#: ../v2v/cmdline.ml:346
msgid "--vmtype option cannot be used with '-o null'"
msgstr ""
@@ -676,19 +676,19 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:305
+#: ../v2v/cmdline.ml:307
msgid "-o glance: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:301
+#: ../v2v/cmdline.ml:303
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:303
+#: ../v2v/cmdline.ml:305
msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:317
+#: ../v2v/cmdline.ml:319
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
@@ -705,47 +705,49 @@ msgid ""
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:331
+#: ../v2v/cmdline.ml:333
msgid "-o local: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:326
+#: ../v2v/cmdline.ml:328
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:342
+#: ../v2v/cmdline.ml:344
msgid "-o null: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:338
+#: ../v2v/cmdline.ml:340
msgid "-o null: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:340
+#: ../v2v/cmdline.ml:342
msgid "-o null: -os option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:357
+#: ../v2v/cmdline.ml:359
msgid "-o rhev: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:355
+#: ../v2v/cmdline.ml:357
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:364
+#: ../v2v/cmdline.ml:366
msgid "-o vdsm: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:366
-msgid "-o vdsm: either --vdsm-image-uuid or --vdsm-vm-uuid was not specified"
+#: ../v2v/cmdline.ml:368
+msgid ""
+"-o vdsm: either --vdsm-image-uuid, --vdsm-vol-uuid or --vdsm-vm-uuid was not "
+"specified"
msgstr ""
-#: ../v2v/cmdline.ml:362
+#: ../v2v/cmdline.ml:364
msgid "-o vdsm: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:349 ../v2v/cmdline.ml:328
+#: ../v2v/cmdline.ml:351 ../v2v/cmdline.ml:330
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -787,7 +789,7 @@ msgstr ""
msgid "Attach data disk/ISO during install"
msgstr ""
-#: ../v2v/cmdline.ml:164
+#: ../v2v/cmdline.ml:166
msgid "Boot in qemu (-o qemu only)"
msgstr ""
@@ -942,11 +944,11 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/output_vdsm.ml:84
+#: ../v2v/output_vdsm.ml:83
msgid "Data Domain"
msgstr ""
-#: ../v2v/cmdline.ml:143 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
+#: ../v2v/cmdline.ml:145 ../sparsify/cmdline.ml:73 ../resize/resize.ml:190
msgid "Debug GC and memory allocations"
msgstr ""
@@ -998,7 +1000,7 @@ msgstr ""
#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:152 ../sysprep/main.ml:151
+#: ../v2v/cmdline.ml:178 ../sysprep/main.ml:152 ../sysprep/main.ml:151
msgid "Display version and exit"
msgstr ""
@@ -1036,7 +1038,7 @@ msgstr ""
msgid "Don't print the summary"
msgstr ""
-#: ../v2v/cmdline.ml:156
+#: ../v2v/cmdline.ml:158
msgid "Don't trim selected mounts"
msgstr ""
@@ -1079,7 +1081,7 @@ msgstr ""
#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:174 ../sysprep/main.ml:150 ../sysprep/main.ml:149
+#: ../v2v/cmdline.ml:176 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Enable debugging messages"
msgstr ""
@@ -1090,7 +1092,7 @@ msgstr ""
#. ../resize/resize.ml:218
#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:179 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:181 ../sysprep/main.ml:153 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1150,7 +1152,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/output_rhev.ml:167
+#: ../v2v/output_rhev.ml:164
msgid "Export Storage Domain"
msgstr ""
@@ -1263,11 +1265,11 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:169
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:237
+#: ../mllib/common_utils.ml:243
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1293,7 +1295,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/cmdline.ml:151
+#: ../v2v/cmdline.ml:153
msgid "Input format (for -i disk)"
msgstr ""
@@ -1317,7 +1319,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:155
+#: ../v2v/cmdline.ml:157
msgid "Just write the metadata"
msgstr ""
@@ -1325,7 +1327,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:159 ../v2v/cmdline.ml:149
+#: ../v2v/cmdline.ml:161 ../v2v/cmdline.ml:151
msgid "Libvirt URI"
msgstr ""
@@ -1340,7 +1342,7 @@ msgstr ""
#. ../resize/resize.ml:197
#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:154 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1349,7 +1351,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:153 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
+#: ../v2v/cmdline.ml:155 ../sparsify/cmdline.ml:79 ../resize/resize.ml:202
msgid "Make output machine readable"
msgstr ""
@@ -1357,11 +1359,11 @@ msgstr ""
msgid "Making directory: %s"
msgstr ""
-#: ../v2v/cmdline.ml:142
+#: ../v2v/cmdline.ml:144
msgid "Map bridge 'in' to 'out'"
msgstr ""
-#: ../v2v/cmdline.ml:154
+#: ../v2v/cmdline.ml:156
msgid "Map network 'in' to 'out'"
msgstr ""
@@ -1432,7 +1434,7 @@ msgstr ""
msgid "Opening the source %s"
msgstr ""
-#: ../v2v/cmdline.ml:173
+#: ../v2v/cmdline.ml:175
msgid "Output VM UUID"
msgstr ""
@@ -1448,15 +1450,15 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:169
-msgid "Output image UUID"
+#: ../v2v/cmdline.ml:171
+msgid "Output image UUID(s)"
msgstr ""
#: ../builder/builder.ml:701
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:173
msgid "Output vol UUID(s)"
msgstr ""
@@ -1499,11 +1501,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:165
msgid "Print source and stop"
msgstr ""
-#: ../v2v/cmdline.ml:165 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:167 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1690,7 +1692,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:161
+#: ../v2v/cmdline.ml:163
msgid "Rename guest when converting"
msgstr ""
@@ -1758,7 +1760,7 @@ msgstr ""
msgid "SELinux relabelling"
msgstr ""
-#: ../v2v/cmdline.ml:145
+#: ../v2v/cmdline.ml:147
msgid "Save overlay files"
msgstr ""
@@ -1798,7 +1800,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:148
+#: ../v2v/cmdline.ml:150
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1828,7 +1830,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:158
+#: ../v2v/cmdline.ml:160
msgid "Set output allocation mode"
msgstr ""
@@ -1840,15 +1842,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:160
+#: ../v2v/cmdline.ml:162
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:157
+#: ../v2v/cmdline.ml:159
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:162
+#: ../v2v/cmdline.ml:164
msgid "Set output storage location"
msgstr ""
@@ -1896,7 +1898,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:178
+#: ../v2v/cmdline.ml:180
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -2282,7 +2284,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/output_rhev.ml:186
+#: ../v2v/output_rhev.ml:183
msgid ""
"cannot write files to the NFS server as %d:%d, even though we appear to be "
"running as root. This probably means the NFS client or idmapd is not "
@@ -2292,7 +2294,7 @@ msgid ""
"otherwise RHEV-M will not be able to import the VM."
msgstr ""
-#: ../v2v/output_rhev.ml:188
+#: ../v2v/output_rhev.ml:185
msgid ""
"cannot write files to the NFS server as %d:%d. You might want to stop virt-"
"v2v (^C) and rerun it as root."
@@ -2479,7 +2481,7 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:279
+#: ../mllib/common_utils.ml:285
msgid "exception: %s"
msgstr ""
@@ -2487,31 +2489,31 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:263
+#: ../v2v/cmdline.ml:265
msgid "expecting a disk image (filename) on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:284
+#: ../v2v/cmdline.ml:286
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:275
+#: ../v2v/cmdline.ml:277
msgid "expecting a libvirt guest name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:293
+#: ../v2v/cmdline.ml:295
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:451
+#: ../mllib/common_utils.ml:457
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:453
+#: ../mllib/common_utils.ml:459
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:455
+#: ../mllib/common_utils.ml:461
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2523,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:276
msgid "failure: %s"
msgstr ""
@@ -2589,7 +2591,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/output_vdsm.ml:94
+#: ../v2v/output_vdsm.ml:96
msgid "image directory (%s) does not exist or is not a directory"
msgstr ""
@@ -2601,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:277
+#: ../mllib/common_utils.ml:283
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:280
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:278
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2621,7 +2623,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/cmdline.ml:71
+#: ../v2v/cmdline.ml:70
msgid "invalid --bridge or --network parameter"
msgstr ""
@@ -2629,7 +2631,7 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:274
msgid "libguestfs error: %s"
msgstr ""
@@ -2847,10 +2849,11 @@ msgstr ""
msgid "subprocess signalled or stopped by signal %d"
msgstr ""
-#: ../v2v/output_vdsm.ml:80
+#: ../v2v/output_vdsm.ml:79
msgid ""
-"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)"
+"the number of '--vdsm-image-uuid' and '--vdsm-vol-uuid' parameters passed on "
+"the command line has to match the number of guest disk images (for this "
+"guest: %d)"
msgstr ""
#: ../v2v/lib_ovf.ml:164
@@ -2929,23 +2932,23 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:129
+#: ../v2v/cmdline.ml:128
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:240
+#: ../v2v/cmdline.ml:242
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:63
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:111
+#: ../v2v/cmdline.ml:110
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:119
+#: ../v2v/cmdline.ml:118
msgid "unknown -oa option: %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