[Pkg-libvirt-commits] [libguestfs] 95/266: Version 1.27.26.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:41:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.
commit 6ae0e9641bdf516c3e14d004ffb7bd5127fd5d9d
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Aug 13 22:10:22 2014 +0100
Version 1.27.26.
---
BUGS | 18 ++-
configure.ac | 2 +-
po-docs/ja.po | 366 +++++++++++++++++++++++++++++---------------
po-docs/libguestfs-docs.pot | 359 +++++++++++++++++++++++++++----------------
po-docs/uk.po | 364 ++++++++++++++++++++++++++++---------------
po/en_GB.po | 237 +++++++++++++++-------------
po/es.po | 237 +++++++++++++++-------------
po/gu.po | 237 +++++++++++++++-------------
po/hi.po | 237 +++++++++++++++-------------
po/kn.po | 237 +++++++++++++++-------------
po/libguestfs.pot | 239 ++++++++++++++++-------------
po/ml.po | 237 +++++++++++++++-------------
po/mr.po | 237 +++++++++++++++-------------
po/nl.po | 237 +++++++++++++++-------------
po/or.po | 237 +++++++++++++++-------------
po/pa.po | 237 +++++++++++++++-------------
po/pl.po | 237 +++++++++++++++-------------
po/ta.po | 237 +++++++++++++++-------------
po/te.po | 237 +++++++++++++++-------------
po/uk.po | 242 ++++++++++++++++-------------
20 files changed, 2735 insertions(+), 1936 deletions(-)
diff --git a/BUGS b/BUGS
index 34286ad..d2677c5 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-05
+Last updated: 2014-08-13
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -296,9 +296,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1102241 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1102241
[RFE] libguestfs should detect OSTree (project-atomic) qcow2 disk image
-1102447 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1102447
- libguestfs 1.27.13 does not build due to libxml library order
-
1102619 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1102619
lvm-clear-filter failed when has two same name but different uuid's VG
@@ -341,6 +338,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1123797 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123797
libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
+1128942 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1128942
+ libguests tools failing on images containing a colon in the path
+
+1129110 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1129110
+ Libguestfs NTFS not setting ACLs
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -359,7 +362,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1069966 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1069966
RFE: let virt-builder etc build ARM guests on x86 host
-(113 bugs)
+(114 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -377,6 +380,9 @@ You can help by testing the fixes.
1122557 POST https://bugzilla.redhat.com/show_bug.cgi?id=1122557
virt-sparsify overwrites block devices if used as output files
+805417 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=805417
+ RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
+
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
@@ -401,7 +407,7 @@ You can help by testing the fixes.
1123794 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1123794
libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
-(12 bugs)
+(13 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index 35c584d..1d93ca0 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], [25])
+m4_define([libguestfs_release], [26])
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 30be7a9..00b9b3b 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-05 18:04+0200\n"
+"POT-Creation-Date: 2014-08-13 22:31+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -718,7 +718,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:168
msgid "B<-q>"
msgstr "B<-q>"
@@ -726,7 +726,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:154
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:170
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -776,7 +776,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:255
msgid "B<-v>"
msgstr "B<-v>"
@@ -791,7 +791,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:257
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -803,7 +803,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:259
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -821,7 +821,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:261
msgid "B<-V>"
msgstr "B<-V>"
@@ -840,7 +840,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:209
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:263
msgid "B<--version>"
msgstr "B<--version>"
@@ -855,7 +855,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:211
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:265
msgid "Display version number and exit."
msgstr "バージョン番号を表示して、終了します。"
@@ -870,7 +870,7 @@ msgstr "バージョン番号を表示して、終了します。"
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:220
+#: ../v2v/virt-v2v.pod:274
msgid "B<-x>"
msgstr "B<-x>"
@@ -883,7 +883,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:276
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1406,7 +1406,8 @@ msgstr "このプログラムは以下を返します:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:184 ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:192
msgid "*"
msgstr "*"
@@ -1487,7 +1488,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:424
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:478
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1527,7 +1528,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:436
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:490
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1557,7 +1558,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:442
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:496
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1886,7 +1887,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:415
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1924,7 +1925,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:434
+#: ../v2v/virt-v2v.pod:488
msgid "AUTHORS"
msgstr "著者"
@@ -1954,7 +1955,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:444
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:498
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2891,7 +2892,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:323
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:377
msgid "1."
msgstr "1."
@@ -2911,7 +2912,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:330
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:384
msgid "2."
msgstr "2."
@@ -2929,7 +2930,7 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:336
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:390
msgid "3."
msgstr "3."
@@ -5358,7 +5359,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:352
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5393,7 +5394,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:367
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5442,7 +5443,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:438
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5456,7 +5457,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:443
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>)."
@@ -5464,13 +5465,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:446
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:450
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5485,7 +5486,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:457
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8623,7 +8624,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:476
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8762,7 +8763,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:347
+#: ../v2v/virt-v2v.pod:401
msgid "FILES"
msgstr "ファイル"
@@ -51821,7 +51822,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:492
msgid "Matthew Booth"
msgstr ""
@@ -53893,7 +53894,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:358
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53926,7 +53927,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:370
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53934,13 +53935,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:319
+#: ../v2v/virt-v2v.pod:373
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:325
+#: ../v2v/virt-v2v.pod:379
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53948,7 +53949,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:328
+#: ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53959,7 +53960,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:386
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54657,7 +54658,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:172
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54840,7 +54841,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:421
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54854,7 +54855,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:424
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 "
@@ -54862,7 +54863,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:428
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54877,7 +54878,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:436
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87650,33 +87651,62 @@ msgstr ""
#. type: =item
#: ../v2v/virt-v2v.pod:71
+#, fuzzy
+#| msgid "B<--no-sync>"
+msgid "B<--no-copy>"
+msgstr "B<--no-sync>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:73
+msgid ""
+"Don't copy the disks. Instead, conversion is performed (and thrown away), "
+"and metadata is written, but no disks are created."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:76
+msgid ""
+"This is useful in two cases: Either you want to test if conversion is likely "
+"to succeed, without the long copying process. Or you are only interested in "
+"looking at the metadata."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:80
+msgid ""
+"This option is not compatible with I<-o libvirt> since it would create a "
+"faulty guest (one with no disks)."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:83
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:85
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:87
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:90
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:92
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:94
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -87684,7 +87714,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -87694,24 +87724,38 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:102
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:105
+#, fuzzy
+#| msgid "B<-o option>"
+msgid "B<-o ovirt>"
+msgstr "B<-o option>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:107
+#, fuzzy
+#| msgid "This is the same as the tune2fs C<-e> option."
+msgid "This is the same as I<-o rhev>."
+msgstr "これは tune2fs C<-e> オプションと同じです。"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:109
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:111
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:113
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -87720,95 +87764,95 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:118
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:120
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:122
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:124
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:110
+#: ../v2v/virt-v2v.pod:126
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:132
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:134
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:136
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:138
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:140
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:143
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:145
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:147
msgid "For I<-o libvirt>, this is a libvirt pool (see S<C<virsh pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:149
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:151
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:154
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87816,7 +87860,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:156
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -87824,7 +87868,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:160
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -87832,44 +87876,112 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:165
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:174
+msgid "B<--rhev-image-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:176
+msgid "B<--rhev-vol-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:178
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--rhev-vm-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:180
+msgid "Normally the RHEV output mode chooses a random UUID for each of:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:186
+msgid "the image directory (I<--rhev-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:190
+msgid "once for each guest disk (I<--rhev-vol-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:194
+msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:198
+msgid "However you can force specific UUIDs instead by using these options."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:200
+msgid ""
+"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
+"at most once."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:203
+msgid ""
+"If the guest has more than one virtual disk, then you should use I<--rhev-"
+"vol-uuid> multiple times to change the UUID of each guest disk."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:207
+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:210
+msgid "These options can only be used with I<-o rhev>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:212
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:214
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:216
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:218
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:220
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:222
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:224
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -87880,14 +87992,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:235
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -87896,7 +88008,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:240
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -87904,7 +88016,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:244
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -87913,7 +88025,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:249
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -87923,12 +88035,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:267
msgid "B<--vmtype> server|desktop"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:269
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<server> or C<desktop>. If the option is not given, then a suitable "
@@ -87936,12 +88048,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:226
+#: ../v2v/virt-v2v.pod:280
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:282
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 "
@@ -87950,7 +88062,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:287
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87958,7 +88070,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87966,7 +88078,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87979,7 +88091,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:300
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87988,7 +88100,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:303
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88000,7 +88112,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88009,7 +88121,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:312
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88017,19 +88129,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:314
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:316
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:265
+#: ../v2v/virt-v2v.pod:319
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 "
@@ -88037,7 +88149,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:324
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 "
@@ -88045,7 +88157,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:329
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88053,7 +88165,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:331
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88061,7 +88173,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:333
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88071,7 +88183,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:337
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88079,7 +88191,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88087,7 +88199,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:341
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88095,7 +88207,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:343
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88103,7 +88215,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:345
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88111,7 +88223,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:347
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88119,7 +88231,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:349
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88128,7 +88240,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:354
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 "
@@ -88136,14 +88248,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:360
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:309
+#: ../v2v/virt-v2v.pod:363
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88153,7 +88265,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:392
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 "
@@ -88161,36 +88273,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:398
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:351
+#: ../v2v/virt-v2v.pod:405
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:407 ../v2v/virt-v2v.pod:461
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:355
+#: ../v2v/virt-v2v.pod:409
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:365
+#: ../v2v/virt-v2v.pod:419
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:430
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 "
@@ -88200,31 +88312,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:440
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:398
+#: ../v2v/virt-v2v.pod:452
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:454
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:405
+#: ../v2v/virt-v2v.pod:459
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:463
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. "
@@ -88234,20 +88346,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:469
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:426
+#: ../v2v/virt-v2v.pod:480
msgid ""
"L<virt-p2v(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, L<guestfs(3)>, "
"L<guestfish(1)>, L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:494
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index fe6ef2b..e0f7393 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.25\n"
+"Project-Id-Version: libguestfs 1.27.26\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-05 18:04+0200\n"
+"POT-Creation-Date: 2014-08-13 22:31+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"
@@ -421,12 +421,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:152
+#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:168
msgid "B<-q>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:154
+#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452 ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85 ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245 ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:170
msgid "B<--quiet>"
msgstr ""
@@ -458,42 +458,42 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:488 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:200 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:116 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193 ../res [...]
msgid "B<--verbose>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:205
+#: ../align/virt-alignment-scan.pod:197 ../cat/virt-cat.pod:169 ../cat/virt-filesystems.pod:269 ../cat/virt-log.pod:116 ../cat/virt-ls.pod:459 ../customize/virt-customize.pod:194 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:207 ../format/virt-format.pod:157 ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242 ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223 ../v2v/virt-v2v.pod:259
msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
msgid "B<-x>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
+#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
msgid "Enable tracing of libguestfs API calls."
msgstr ""
@@ -774,7 +774,7 @@ msgid "This program returns:"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
msgid "*"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:361
+#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:415
msgid "ENVIRONMENT VARIABLES"
msgstr ""
@@ -1148,7 +1148,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:336
+#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:390
msgid "3."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:352
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -4539,7 +4539,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:367
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -4587,7 +4587,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:438
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -4599,19 +4599,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:443
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:446
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:450
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -4624,7 +4624,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:457
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7336,7 +7336,7 @@ msgid "This program returns 0 on success, or 1 if there was an error."
msgstr ""
#. type: textblock
-#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:476
msgid "For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -7462,7 +7462,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:347
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:401
msgid "FILES"
msgstr ""
@@ -47502,7 +47502,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:492
msgid "Matthew Booth"
msgstr ""
@@ -49401,7 +49401,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:304
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:358
msgid "There are two ways to use this option."
msgstr ""
@@ -49426,26 +49426,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:316
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:370
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:319
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:373
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:325
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:379
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
msgstr ""
#. type: verbatim
-#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:328
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -49453,7 +49453,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:332
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:386
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -50095,7 +50095,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:172
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -50268,7 +50268,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:421
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -50282,7 +50282,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:424
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -50290,7 +50290,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:428
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50305,7 +50305,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:436
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78450,33 +78450,60 @@ msgstr ""
#. type: =item
#: ../v2v/virt-v2v.pod:71
-msgid "B<-o libvirt>"
+msgid "B<--no-copy>"
msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:73
+msgid ""
+"Don't copy the disks. Instead, conversion is performed (and thrown away), "
+"and metadata is written, but no disks are created."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:76
+msgid ""
+"This is useful in two cases: Either you want to test if conversion is likely "
+"to succeed, without the long copying process. Or you are only interested in "
+"looking at the metadata."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:80
+msgid ""
+"This option is not compatible with I<-o libvirt> since it would create a "
+"faulty guest (one with no disks)."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:83
+msgid "B<-o libvirt>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:85
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:87
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:90
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:92
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:94
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -78484,7 +78511,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -78494,24 +78521,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:102
msgid ""
"and a libvirt XML file is created containing guest metadata "
"(C</dir/name.xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:105
+msgid "B<-o ovirt>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:107
+msgid "This is the same as I<-o rhev>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:109
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:111
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:113
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -78520,95 +78557,95 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:118
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:120
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:122
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:124
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:110
+#: ../v2v/virt-v2v.pod:126
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:132
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:134
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:136
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:138
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:140
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:143
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:145
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:147
msgid "For I<-o libvirt>, this is a libvirt pool (see S<C<virsh pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:149
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:151
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:154
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -78616,7 +78653,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:156
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -78624,7 +78661,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:160
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -78632,44 +78669,110 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:165
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:174
+msgid "B<--rhev-image-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:176
+msgid "B<--rhev-vol-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:178
+msgid "B<--rhev-vm-uuid> UUID"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:180
+msgid "Normally the RHEV output mode chooses a random UUID for each of:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:186
+msgid "the image directory (I<--rhev-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:190
+msgid "once for each guest disk (I<--rhev-vol-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:194
+msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:198
+msgid "However you can force specific UUIDs instead by using these options."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:200
+msgid ""
+"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
+"at most once."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:203
+msgid ""
+"If the guest has more than one virtual disk, then you should use "
+"I<--rhev-vol-uuid> multiple times to change the UUID of each guest disk."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:207
+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:210
+msgid "These options can only be used with I<-o rhev>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:212
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:214
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:216
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:218
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:220
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:222
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:224
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -78680,14 +78783,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:235
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -78696,7 +78799,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:240
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -78704,7 +78807,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:244
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -78713,7 +78816,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:249
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -78723,12 +78826,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:267
msgid "B<--vmtype> server|desktop"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:269
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<server> or C<desktop>. If the option is not given, then a suitable "
@@ -78736,12 +78839,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:226
+#: ../v2v/virt-v2v.pod:280
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:282
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 "
@@ -78750,7 +78853,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:287
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -78758,7 +78861,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -78766,7 +78869,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -78779,7 +78882,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:300
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -78788,7 +78891,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:303
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -78800,7 +78903,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -78809,7 +78912,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:312
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -78817,19 +78920,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:314
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:316
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:265
+#: ../v2v/virt-v2v.pod:319
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 "
@@ -78837,7 +78940,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:324
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 "
@@ -78845,7 +78948,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:329
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -78853,7 +78956,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:331
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -78861,7 +78964,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:333
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -78871,7 +78974,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:337
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -78879,7 +78982,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -78887,7 +78990,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:341
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -78895,7 +78998,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:343
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -78903,7 +79006,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:345
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -78911,7 +79014,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:347
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -78919,7 +79022,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:349
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -78928,7 +79031,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:354
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 "
@@ -78936,14 +79039,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:360
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:309
+#: ../v2v/virt-v2v.pod:363
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -78953,7 +79056,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:392
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 "
@@ -78961,36 +79064,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:398
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:351
+#: ../v2v/virt-v2v.pod:405
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:407 ../v2v/virt-v2v.pod:461
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:355
+#: ../v2v/virt-v2v.pod:409
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:365
+#: ../v2v/virt-v2v.pod:419
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:430
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 "
@@ -79000,31 +79103,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:440
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:398
+#: ../v2v/virt-v2v.pod:452
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:454
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:405
+#: ../v2v/virt-v2v.pod:459
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:463
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. "
@@ -79034,20 +79137,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:469
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:426
+#: ../v2v/virt-v2v.pod:480
msgid ""
"L<virt-p2v(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, L<guestfs(3)>, "
"L<guestfish(1)>, L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:494
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index e57b8a2..18baa08 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-05 18:04+0200\n"
+"POT-Creation-Date: 2014-08-13 22:31+0200\n"
"PO-Revision-Date: 2014-07-22 18:04+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -731,7 +731,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:168
msgid "B<-q>"
msgstr "B<-q>"
@@ -739,7 +739,7 @@ msgstr "B<-q>"
#: ../align/virt-alignment-scan.pod:179 ../builder/virt-builder.pod:452
#: ../customize/virt-customize.pod:180 ../fuse/guestunmount.pod:85
#: ../resize/virt-resize.pod:509 ../sparsify/virt-sparsify.pod:245
-#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:154
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:170
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -789,7 +789,7 @@ msgstr ""
#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:191
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:255
msgid "B<-v>"
msgstr "B<-v>"
@@ -804,7 +804,7 @@ msgstr "B<-v>"
#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:193
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:257
msgid "B<--verbose>"
msgstr "B<--verbose>"
@@ -816,7 +816,7 @@ msgstr "B<--verbose>"
#: ../edit/virt-edit.pod:207 ../format/virt-format.pod:157
#: ../inspector/virt-inspector.pod:120 ../rescue/virt-rescue.pod:242
#: ../sparsify/virt-sparsify.pod:296 ../sysprep/virt-sysprep.pod:223
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:259
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -834,7 +834,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:583 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:225 ../test-tool/libguestfs-test-tool.pod:59
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:261
msgid "B<-V>"
msgstr "B<-V>"
@@ -853,7 +853,7 @@ msgstr "B<-V>"
#: ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:227 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
-#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:209
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:263
msgid "B<--version>"
msgstr "B<--version>"
@@ -868,7 +868,7 @@ msgstr "B<--version>"
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:229
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
-#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:211
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:265
msgid "Display version number and exit."
msgstr "Показати дані щодо версії і завершити роботу."
@@ -883,7 +883,7 @@ msgstr "Показати дані щодо версії і завершити р
#: ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:304
#: ../sysprep/virt-sysprep.pod:231 ../tools/virt-tar:155
-#: ../v2v/virt-v2v.pod:220
+#: ../v2v/virt-v2v.pod:274
msgid "B<-x>"
msgstr "B<-x>"
@@ -896,7 +896,7 @@ msgstr "B<-x>"
#: ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130
#: ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:276
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1380,7 +1380,8 @@ msgstr "Ця програма повертає:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:184 ../v2v/virt-v2v.pod:188
+#: ../v2v/virt-v2v.pod:192
msgid "*"
msgstr "*"
@@ -1457,7 +1458,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:424
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:478
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1497,7 +1498,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:436
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:490
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1527,7 +1528,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:442
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:496
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1843,7 +1844,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:415
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1881,7 +1882,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:434
+#: ../v2v/virt-v2v.pod:488
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1911,7 +1912,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:444
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:498
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2900,7 +2901,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:323
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:377
msgid "1."
msgstr "1."
@@ -2920,7 +2921,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:330
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:384
msgid "2."
msgstr "2."
@@ -2938,7 +2939,7 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:336
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:390
msgid "3."
msgstr "3."
@@ -5503,7 +5504,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:352
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5538,7 +5539,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:367
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5587,7 +5588,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:438
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5601,7 +5602,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:443
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>)."
@@ -5609,13 +5610,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:446
msgid "This directory may contain the following files:"
msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232
-#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:450
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5630,7 +5631,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:457
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8690,7 +8691,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:476
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8825,7 +8826,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:347
+#: ../v2v/virt-v2v.pod:401
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50839,7 +50840,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:492
msgid "Matthew Booth"
msgstr ""
@@ -52843,7 +52844,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:358
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52876,7 +52877,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:370
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52884,13 +52885,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:319
+#: ../v2v/virt-v2v.pod:373
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:325
+#: ../v2v/virt-v2v.pod:379
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52898,7 +52899,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:328
+#: ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52909,7 +52910,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:386
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53585,7 +53586,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:172
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53765,7 +53766,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:421
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53779,7 +53780,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:424
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 "
@@ -53787,7 +53788,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:428
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53802,7 +53803,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:436
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86573,33 +86574,62 @@ msgstr ""
#. type: =item
#: ../v2v/virt-v2v.pod:71
+#, fuzzy
+#| msgid "B<--no-sync>"
+msgid "B<--no-copy>"
+msgstr "B<--no-sync>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:73
+msgid ""
+"Don't copy the disks. Instead, conversion is performed (and thrown away), "
+"and metadata is written, but no disks are created."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:76
+msgid ""
+"This is useful in two cases: Either you want to test if conversion is likely "
+"to succeed, without the long copying process. Or you are only interested in "
+"looking at the metadata."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:80
+msgid ""
+"This option is not compatible with I<-o libvirt> since it would create a "
+"faulty guest (one with no disks)."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:83
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:85
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:75
+#: ../v2v/virt-v2v.pod:87
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:78
+#: ../v2v/virt-v2v.pod:90
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:92
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:82
+#: ../v2v/virt-v2v.pod:94
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -86607,7 +86637,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:86
+#: ../v2v/virt-v2v.pod:98
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -86617,24 +86647,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:102
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:93
+#: ../v2v/virt-v2v.pod:105
+#, fuzzy
+#| msgid "B<-o option>"
+msgid "B<-o ovirt>"
+msgstr "B<-o параметр>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:107
+msgid "This is the same as I<-o rhev>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:109
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:95
+#: ../v2v/virt-v2v.pod:111
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:97
+#: ../v2v/virt-v2v.pod:113
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -86643,95 +86685,95 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:102
+#: ../v2v/virt-v2v.pod:118
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:120
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:106
+#: ../v2v/virt-v2v.pod:122
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:108
+#: ../v2v/virt-v2v.pod:124
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:110
+#: ../v2v/virt-v2v.pod:126
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:116
+#: ../v2v/virt-v2v.pod:132
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:118
+#: ../v2v/virt-v2v.pod:134
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:136
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:138
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:140
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:143
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:129
+#: ../v2v/virt-v2v.pod:145
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:147
msgid "For I<-o libvirt>, this is a libvirt pool (see S<C<virsh pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:133
+#: ../v2v/virt-v2v.pod:149
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:135
+#: ../v2v/virt-v2v.pod:151
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:154
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -86739,7 +86781,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:156
msgid ""
"The NFS export must be mountable and writable by the user and host running "
"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
@@ -86747,7 +86789,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:144
+#: ../v2v/virt-v2v.pod:160
msgid ""
"B<Or:> You can mount the Export Storage Domain yourself, and point I<-os> to "
"the mountpoint. Note that virt-v2v will still need to write to this remote "
@@ -86755,44 +86797,112 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:165
msgid ""
"You will get an error if virt-v2v is unable to mount/write to the Export "
"Storage Domain."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:174
+msgid "B<--rhev-image-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:176
+msgid "B<--rhev-vol-uuid> UUID"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:178
+#, fuzzy
+#| msgid "B<lvm-uuids> *"
+msgid "B<--rhev-vm-uuid> UUID"
+msgstr "B<lvm-uuids> *"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:180
+msgid "Normally the RHEV output mode chooses a random UUID for each of:"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:186
+msgid "the image directory (I<--rhev-image-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:190
+msgid "once for each guest disk (I<--rhev-vol-uuid>)"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:194
+msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:198
+msgid "However you can force specific UUIDs instead by using these options."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:200
+msgid ""
+"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
+"at most once."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:203
+msgid ""
+"If the guest has more than one virtual disk, then you should use I<--rhev-"
+"vol-uuid> multiple times to change the UUID of each guest disk."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:207
+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:210
+msgid "These options can only be used with I<-o rhev>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:212
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:214
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:216
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:164
+#: ../v2v/virt-v2v.pod:218
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:166
+#: ../v2v/virt-v2v.pod:220
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:222
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:224
msgid ""
"In the case where the virtual machine is dual-boot or multi-boot, or where "
"the VM has other filesystems that look like operating systems, this option "
@@ -86803,14 +86913,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The default in virt-v2v E<le> 0.7.1 was S<I<--root single>>, which causes "
"virt-v2v to die if a multi-boot operating system is found."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:235
msgid ""
"Since virt-v2v E<ge> 0.7.2 the default is now S<I<--root ask>>: If the VM is "
"found to be multi-boot, then virt-v2v will stop and list the possible root "
@@ -86819,7 +86929,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:186
+#: ../v2v/virt-v2v.pod:240
msgid ""
"S<I<--root first>> means to choose the first root device in the case of a "
"multi-boot operating system. Since this is a heuristic, it may sometimes "
@@ -86827,7 +86937,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:190
+#: ../v2v/virt-v2v.pod:244
msgid ""
"You can also name a specific root device, eg. S<I<--root /dev/sda2>> would "
"mean to use the second partition on the first hard drive. If the named root "
@@ -86836,7 +86946,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:195
+#: ../v2v/virt-v2v.pod:249
msgid ""
"Note that there is a bug in grub which prevents it from successfully booting "
"a multiboot system if VirtIO is enabled. Grub is only able to boot an "
@@ -86846,12 +86956,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:267
msgid "B<--vmtype> server|desktop"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:269
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<server> or C<desktop>. If the option is not given, then a suitable "
@@ -86859,12 +86969,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:226
+#: ../v2v/virt-v2v.pod:280
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:228
+#: ../v2v/virt-v2v.pod:282
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 "
@@ -86873,7 +86983,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:233
+#: ../v2v/virt-v2v.pod:287
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -86881,7 +86991,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:237
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -86889,7 +86999,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:239
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -86902,7 +87012,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:246
+#: ../v2v/virt-v2v.pod:300
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -86911,7 +87021,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:249
+#: ../v2v/virt-v2v.pod:303
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -86923,7 +87033,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -86932,7 +87042,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:258
+#: ../v2v/virt-v2v.pod:312
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -86940,19 +87050,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:314
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:316
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:265
+#: ../v2v/virt-v2v.pod:319
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 "
@@ -86960,7 +87070,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:324
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 "
@@ -86968,7 +87078,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:329
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -86976,7 +87086,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:331
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -86984,7 +87094,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:333
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -86994,7 +87104,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:337
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87002,7 +87112,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87010,7 +87120,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:341
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87018,7 +87128,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:343
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87026,7 +87136,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:345
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87034,7 +87144,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:347
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87042,7 +87152,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:295
+#: ../v2v/virt-v2v.pod:349
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87051,7 +87161,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
+#: ../v2v/virt-v2v.pod:354
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 "
@@ -87059,14 +87169,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:360
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:309
+#: ../v2v/virt-v2v.pod:363
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -87076,7 +87186,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:392
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 "
@@ -87084,36 +87194,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:398
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:351
+#: ../v2v/virt-v2v.pod:405
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
+#: ../v2v/virt-v2v.pod:407 ../v2v/virt-v2v.pod:461
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:355
+#: ../v2v/virt-v2v.pod:409
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:365
+#: ../v2v/virt-v2v.pod:419
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:430
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 "
@@ -87123,31 +87233,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:440
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:398
+#: ../v2v/virt-v2v.pod:452
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:454
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:405
+#: ../v2v/virt-v2v.pod:459
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:409
+#: ../v2v/virt-v2v.pod:463
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. "
@@ -87157,20 +87267,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:415
+#: ../v2v/virt-v2v.pod:469
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:426
+#: ../v2v/virt-v2v.pod:480
msgid ""
"L<virt-p2v(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, L<guestfs(3)>, "
"L<guestfish(1)>, L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:494
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 7e8e8af..b607c75 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: failed to create handle\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7367,21 +7393,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr ""
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7481,48 +7512,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr ""
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7591,44 +7622,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 1b97567..e1ae5af 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,6 +628,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -649,23 +653,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -737,7 +741,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -773,7 +777,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -840,7 +844,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -892,7 +896,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -969,7 +973,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -980,7 +984,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -988,7 +992,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1076,7 +1080,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1134,7 +1138,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,11 +1176,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1191,7 +1199,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1200,7 +1208,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1269,6 +1277,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1281,10 +1293,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1312,11 +1332,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1509,7 +1529,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1613,7 +1633,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1643,7 +1663,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1655,15 +1675,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1711,7 +1731,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1894,7 +1914,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1932,13 +1952,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2018,7 +2038,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2028,14 +2048,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2088,7 +2108,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2106,11 +2126,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2171,7 +2191,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2187,7 +2207,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2195,13 +2215,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2219,22 +2239,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2242,7 +2262,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2250,7 +2270,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2306,7 +2326,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2318,7 +2338,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2334,14 +2354,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2350,11 +2370,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2363,13 +2389,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2407,7 +2433,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2417,27 +2443,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2710,7 +2736,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: falló al crear manipulador\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2742,43 +2768,43 @@ msgstr "alineamiento <4K"
msgid "alignment < 64K"
msgstr "alineamiento <64K"
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7492,21 +7518,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: llamado dos veces en la misma manipulación\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7608,49 +7639,49 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7719,44 +7750,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index e17b44f..66c7cd1 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,6 +627,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -648,23 +652,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -736,7 +740,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -772,7 +776,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -800,7 +804,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -839,7 +843,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -968,7 +972,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -979,7 +983,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -987,7 +991,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1075,7 +1079,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1133,7 +1137,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,11 +1175,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1190,7 +1198,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1199,7 +1207,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1268,6 +1276,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1280,10 +1292,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1311,11 +1331,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1508,7 +1528,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1612,7 +1632,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1642,7 +1662,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1654,15 +1674,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1710,7 +1730,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1893,7 +1913,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1931,13 +1951,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2017,7 +2037,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2027,14 +2047,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2087,7 +2107,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2105,11 +2125,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2170,7 +2190,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2186,7 +2206,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2194,13 +2214,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2218,22 +2238,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2241,7 +2261,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2249,7 +2269,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2305,7 +2325,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2317,7 +2337,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2333,14 +2353,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2349,11 +2369,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2362,13 +2388,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2406,7 +2432,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2416,27 +2442,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2709,7 +2735,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: હેન્ડલ ને બનાવવાનું નિષ્ફળ\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2741,43 +2767,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7344,21 +7370,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: એજ હેન્ડલ પર બે વાર બોલાવેલ છે\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7458,48 +7489,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7568,44 +7599,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 8a9e34d..40221ae 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,6 +627,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -648,23 +652,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -736,7 +740,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -772,7 +776,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -800,7 +804,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -839,7 +843,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -968,7 +972,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -979,7 +983,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -987,7 +991,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1075,7 +1079,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1133,7 +1137,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,11 +1175,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1190,7 +1198,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1199,7 +1207,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1268,6 +1276,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1280,10 +1292,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1311,11 +1331,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1508,7 +1528,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1612,7 +1632,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1642,7 +1662,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1654,15 +1674,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1710,7 +1730,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1893,7 +1913,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1931,13 +1951,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2017,7 +2037,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2027,14 +2047,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2087,7 +2107,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2105,11 +2125,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2170,7 +2190,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2186,7 +2206,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2194,13 +2214,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2218,22 +2238,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2241,7 +2261,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2249,7 +2269,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2305,7 +2325,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2317,7 +2337,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2333,14 +2353,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2349,11 +2369,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2362,13 +2388,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2406,7 +2432,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2416,27 +2442,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2709,7 +2735,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: नियंत्रण बनाने में विफल\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2741,43 +2767,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7342,21 +7368,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: called twice on the same handle\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7456,48 +7487,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "you must call guestfs_add_drive before guestfs_launch"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu launched and contacted daemon, but state != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7566,44 +7597,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index b3eabb4..2748c76 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿರ್ಮಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7346,21 +7372,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: ಒಂದೇ ಹ್ಯಾಂಡಲ್ನಲ್ಲಿ ಎರಡು ಬಾರಿ ಕರೆಲಾಗಿದೆ\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7460,48 +7491,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7570,44 +7601,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index a756abc..969365e 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.25\n"
+"Project-Id-Version: libguestfs 1.27.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -219,7 +219,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -269,7 +269,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -279,13 +279,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -306,7 +306,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -316,7 +316,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -343,14 +343,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -358,7 +358,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -625,6 +625,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -646,23 +650,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -734,7 +738,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -770,7 +774,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -798,7 +802,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -837,7 +841,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -889,7 +893,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -966,7 +970,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -977,7 +981,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -985,7 +989,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1073,7 +1077,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1131,7 +1135,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1169,11 +1173,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1188,7 +1196,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1197,7 +1205,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1266,6 +1274,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1278,10 +1290,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1309,11 +1329,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1506,7 +1526,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1610,7 +1630,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1640,7 +1660,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1652,15 +1672,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1708,7 +1728,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1891,7 +1911,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1929,13 +1949,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2015,7 +2035,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2025,14 +2045,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2060,7 +2080,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2085,7 +2105,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2103,11 +2123,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2168,7 +2188,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2184,7 +2204,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2192,13 +2212,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2216,22 +2236,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2239,7 +2259,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2247,7 +2267,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2303,7 +2323,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2315,7 +2335,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2331,14 +2351,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2347,11 +2367,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2360,13 +2386,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2404,7 +2430,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2414,27 +2440,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2707,7 +2733,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr ""
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2739,43 +2765,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7332,21 +7358,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr ""
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7446,48 +7477,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr ""
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7556,44 +7587,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index cf75b17..6333181 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ഹാന്ഡില് ഉണ്ടാക്കുന്നതില് പരാജയപ്പെട്ടു\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7344,21 +7370,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: ഒരേ ഹാന്ഡിലില് രണ്ടു് തവണ വിളിച്ചിരിക്കുന്നു\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7458,48 +7489,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7568,44 +7599,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 40737db..47f9303 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,6 +627,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -648,23 +652,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -736,7 +740,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -772,7 +776,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -800,7 +804,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -839,7 +843,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -968,7 +972,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -979,7 +983,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -987,7 +991,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1075,7 +1079,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1133,7 +1137,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,11 +1175,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1190,7 +1198,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1199,7 +1207,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1268,6 +1276,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1280,10 +1292,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1311,11 +1331,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1508,7 +1528,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1612,7 +1632,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1642,7 +1662,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1654,15 +1674,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1710,7 +1730,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1893,7 +1913,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1931,13 +1951,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2017,7 +2037,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2027,14 +2047,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2087,7 +2107,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2105,11 +2125,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2170,7 +2190,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2186,7 +2206,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2194,13 +2214,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2218,22 +2238,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2241,7 +2261,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2249,7 +2269,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2305,7 +2325,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2317,7 +2337,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2333,14 +2353,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2349,11 +2369,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2362,13 +2388,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2406,7 +2432,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2416,27 +2442,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2709,7 +2735,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: हँडल निर्माण करण्यास अशक्य\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2741,43 +2767,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7411,21 +7437,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: एकाच हँडलवर दोनवेळा कॉल केले\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7527,48 +7558,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7637,44 +7668,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 564a18b..40e3ab0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,6 +628,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -649,23 +653,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -737,7 +741,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -773,7 +777,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -840,7 +844,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -892,7 +896,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -969,7 +973,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -980,7 +984,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -988,7 +992,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1076,7 +1080,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1134,7 +1138,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,11 +1176,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1191,7 +1199,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1200,7 +1208,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1269,6 +1277,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1281,10 +1293,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1312,11 +1332,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1509,7 +1529,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1613,7 +1633,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1643,7 +1663,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1655,15 +1675,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1711,7 +1731,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1894,7 +1914,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1932,13 +1952,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2018,7 +2038,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2028,14 +2048,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2088,7 +2108,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2106,11 +2126,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2171,7 +2191,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2187,7 +2207,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2195,13 +2215,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2219,22 +2239,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2242,7 +2262,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2250,7 +2270,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2306,7 +2326,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2318,7 +2338,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2334,14 +2354,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2350,11 +2370,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2363,13 +2389,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2407,7 +2433,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2417,27 +2443,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2710,7 +2736,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: hendel aanmaken mislukte\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2742,43 +2768,43 @@ msgstr "uitlijning < 4K"
msgid "alignment < 64K"
msgstr "uitlijning < 64K"
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7542,21 +7568,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: twee keer dezelfde hendel aangeroepen\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7659,49 +7690,49 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr "realpath: kon '%s' niet converteren naar een absoluut pad"
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7770,44 +7801,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr "kon libvirt domein niet vernietigen"
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr "%s: interne fout bij formuleren van foutboodschap"
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr "kon schijf niet koppelen aan libvirt domein"
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr "kon schijf niet loskoppelen van libvirt domein"
diff --git a/po/or.po b/po/or.po
index 36b0b4c..c6a5a90 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ନିୟନ୍ତ୍ରଣ ପ୍ରସ୍ତୁତ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7342,21 +7368,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: ସମାନ ନିୟନ୍ତ୍ରଣରେ ଦୁଇଥର ଡ଼ାକିଥିଲା\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7456,48 +7487,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7566,44 +7597,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index d19fbe3..f75d7cd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,6 +627,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -648,23 +652,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -736,7 +740,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -772,7 +776,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -800,7 +804,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -839,7 +843,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -891,7 +895,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -968,7 +972,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -979,7 +983,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -987,7 +991,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1075,7 +1079,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1133,7 +1137,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,11 +1175,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1190,7 +1198,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1199,7 +1207,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1268,6 +1276,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1280,10 +1292,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1311,11 +1331,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1508,7 +1528,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1612,7 +1632,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1642,7 +1662,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1654,15 +1674,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1710,7 +1730,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1893,7 +1913,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1931,13 +1951,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2017,7 +2037,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2027,14 +2047,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2062,7 +2082,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2087,7 +2107,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2105,11 +2125,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2170,7 +2190,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2186,7 +2206,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2194,13 +2214,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2218,22 +2238,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2241,7 +2261,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2249,7 +2269,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2305,7 +2325,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2317,7 +2337,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2333,14 +2353,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2349,11 +2369,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2362,13 +2388,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2406,7 +2432,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2416,27 +2442,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2709,7 +2735,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ਹੈਂਡਲ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2741,43 +2767,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7408,21 +7434,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: called twice on the same handle\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7524,48 +7555,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "you must call guestfs_add_drive before guestfs_launch"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu launched and contacted daemon, but state != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7634,44 +7665,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 8d39541..fd85b0c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -224,7 +224,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -284,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -321,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -348,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -630,6 +630,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -651,23 +655,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -739,7 +743,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -775,7 +779,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -803,7 +807,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -842,7 +846,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -894,7 +898,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -971,7 +975,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -990,7 +994,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1078,7 +1082,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1136,7 +1140,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1174,11 +1178,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1193,7 +1201,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1202,7 +1210,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1271,6 +1279,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1283,10 +1295,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1314,11 +1334,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1511,7 +1531,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1615,7 +1635,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1645,7 +1665,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1657,15 +1677,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1713,7 +1733,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1896,7 +1916,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1934,13 +1954,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2020,7 +2040,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2030,14 +2050,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2065,7 +2085,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2090,7 +2110,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2108,11 +2128,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2173,7 +2193,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2189,7 +2209,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2197,13 +2217,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2221,22 +2241,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2244,7 +2264,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2252,7 +2272,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2308,7 +2328,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2320,7 +2340,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2336,14 +2356,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2352,11 +2372,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2365,13 +2391,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2409,7 +2435,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2419,27 +2445,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2712,7 +2738,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: utworzenie programu obsługi się nie powiodło\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2744,43 +2770,43 @@ msgstr "wyrównanie < 4K"
msgid "alignment < 64K"
msgstr "wyrównanie < 64K"
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7566,21 +7592,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: wywołano dwa razy w tym samym programie obsługującym\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7684,49 +7715,49 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "należy wywołać guestfs_add_drive przed guestfs_launch"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7795,44 +7826,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
diff --git a/po/ta.po b/po/ta.po
index 67a350a..87f9ba4 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ஹாண்டிலை உருவாக்க முடியவில்லை\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7343,21 +7369,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: அதே ஹாண்டலில் இரண்டு முறை அழைக்கப்பட்டது\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7457,48 +7488,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7567,44 +7598,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/te.po b/po/te.po
index bdc2bbe..4d329a5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +344,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +359,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,6 +626,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -647,23 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -799,7 +803,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -890,7 +894,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -967,7 +971,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -978,7 +982,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -986,7 +990,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1074,7 +1078,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,11 +1174,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1197,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1206,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1267,6 +1275,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1279,10 +1291,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1310,11 +1330,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1507,7 +1527,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1611,7 +1631,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1641,7 +1661,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1653,15 +1673,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1709,7 +1729,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1892,7 +1912,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1930,13 +1950,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2016,7 +2036,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2026,14 +2046,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2061,7 +2081,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2086,7 +2106,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2104,11 +2124,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2169,7 +2189,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2185,7 +2205,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2193,13 +2213,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2217,22 +2237,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2240,7 +2260,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2248,7 +2268,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2304,7 +2324,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2316,7 +2336,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2332,14 +2352,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2348,11 +2368,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2361,13 +2387,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2405,7 +2431,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2415,27 +2441,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2708,7 +2734,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: సంభాలికను సృష్టించుటకు విఫలమైంది\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2740,43 +2766,43 @@ msgstr ""
msgid "alignment < 64K"
msgstr ""
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
"builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.0\n"
msgstr ""
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
"with virt-builder 1.24.1\n"
msgstr ""
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7340,21 +7366,26 @@ msgid "'direct' backend does not work"
msgstr ""
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: ఒకే సంభాలికపై రెండుసార్లు పిలువబడింది\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
msgstr ""
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -7454,48 +7485,48 @@ msgid ""
"might need to log out and log in again)."
msgstr ""
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ఆరంభించబడింది మరియు డెమోన్ను సంప్రదించింది, అయితే state != READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr ""
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
msgstr ""
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
"'%s' format files"
msgstr ""
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -7564,44 +7595,44 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 3070c06..46ec4f6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-05 18:04+0100\n"
+"POT-Creation-Date: 2014-08-13 22:08+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s (ignored)\n"
msgstr ""
-#: ../v2v/convert_linux.ml:1083
+#: ../v2v/convert_linux.ml:1084
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:122
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:364 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:357 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:360 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:382 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:379 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:376 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:373 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:367 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,6 +628,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../v2v/cmdline.ml:209
+msgid "--no-copy and '-o libvirt' cannot be used at the same time"
+msgstr ""
+
#: ../resize/resize.ml:172
msgid "--shrink option given twice"
msgstr ""
@@ -649,23 +653,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/cmdline.ml:188
+#: ../v2v/cmdline.ml:205
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:194
+#: ../v2v/cmdline.ml:214
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:203
-msgid "-o local: output storage was not specified, use '-os'"
+#: ../v2v/cmdline.ml:224
+msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:196
+#: ../v2v/cmdline.ml:216
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -737,7 +741,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:148
msgid "Closing the overlay"
msgstr ""
@@ -773,7 +777,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:167
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:189
+#: ../v2v/v2v.ml:193
msgid "Creating output metadata"
msgstr ""
@@ -840,7 +844,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -892,7 +896,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -969,7 +973,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -980,7 +984,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -988,7 +992,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:288
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1076,7 +1080,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:213 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:208 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1134,7 +1138,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:110
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,11 +1176,15 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
+#: ../v2v/cmdline.ml:95
+msgid "Just write the metadata"
+msgstr ""
+
#: ../builder/list_entries.ml:57
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
+#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
msgid "Libvirt URI"
msgstr ""
@@ -1191,7 +1199,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1200,7 +1208,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1269,6 +1277,10 @@ msgstr ""
msgid "Opening the overlay"
msgstr ""
+#: ../v2v/cmdline.ml:109
+msgid "Output VM UUID"
+msgstr ""
+
#: ../builder/builder.ml:696
msgid "Output file"
msgstr ""
@@ -1281,10 +1293,18 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
+#: ../v2v/cmdline.ml:105
+msgid "Output image UUID"
+msgstr ""
+
#: ../builder/builder.ml:697
msgid "Output size"
msgstr ""
+#: ../v2v/cmdline.ml:107
+msgid "Output vol UUID(s)"
+msgstr ""
+
#: ../customize/customize_cmdline.ml:140
msgid "PATH"
msgstr ""
@@ -1312,11 +1332,11 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
-#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+#: ../v2v/target_RHEV.ml:544 ../v2v/target_RHEV.ml:141
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
@@ -1509,7 +1529,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:100
msgid "Rename guest when converting"
msgstr ""
@@ -1613,7 +1633,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1643,7 +1663,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:90
+#: ../v2v/cmdline.ml:97
msgid "Set output allocation mode"
msgstr ""
@@ -1655,15 +1675,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:99
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:96
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:94
+#: ../v2v/cmdline.ml:101
msgid "Set output storage location"
msgstr ""
@@ -1711,7 +1731,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:102
+#: ../v2v/cmdline.ml:115
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1894,7 +1914,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:138
+#: ../v2v/v2v.ml:139
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1932,13 +1952,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:602
+#: ../v2v/convert_linux.ml:603
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:517
+#: ../v2v/convert_linux.ml:518
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2018,7 +2038,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:291
msgid "connection closed"
msgstr ""
@@ -2028,14 +2048,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/target_RHEV.ml:206
+#: ../v2v/target_RHEV.ml:208
msgid ""
"could not read the Export Storage Domain specified by the '-os %s' parameter "
"on the command line. Is it really an OVirt or RHEV-M Export Storage "
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:990
+#: ../v2v/convert_linux.ml:991
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2063,7 +2083,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:234
+#: ../v2v/v2v.ml:230
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
@@ -2088,7 +2108,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:275
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2106,11 +2126,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:180
+#: ../v2v/cmdline.ml:197
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:172
+#: ../v2v/cmdline.ml:189
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2171,7 +2191,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:313
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2187,7 +2207,7 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/target_RHEV.ml:183
+#: ../v2v/target_RHEV.ml:185
msgid ""
"mount command failed, see earlier errors.\n"
"\n"
@@ -2195,13 +2215,13 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:298
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
msgstr ""
-#: ../v2v/convert_linux.ml:190
+#: ../v2v/convert_linux.ml:191
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2219,22 +2239,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:95
+#: ../v2v/convert_linux.ml:96
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:185
+#: ../v2v/convert_linux.ml:186
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:251
+#: ../v2v/convert_linux.ml:252
msgid ""
"no installed kernel packages were found.\n"
"\n"
"This probably indicates that %s was unable to inspect this guest properly."
msgstr ""
-#: ../v2v/convert_linux.ml:362
+#: ../v2v/convert_linux.ml:363
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2242,7 +2262,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:268
msgid "no root device found in this operating system image."
msgstr ""
@@ -2250,7 +2270,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:717
+#: ../v2v/convert_linux.ml:718
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2306,7 +2326,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:188 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2318,7 +2338,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:306
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2334,14 +2354,14 @@ msgstr ""
msgid "sectors"
msgstr ""
-#: ../v2v/target_RHEV.ml:226
+#: ../v2v/target_RHEV.ml:228
msgid ""
"the Export Storage Domain (%s) has not been attached to any Data Center.\n"
"\n"
"You have to do this through the RHEV-M / OVirt user interface first."
msgstr ""
-#: ../v2v/target_RHEV.ml:231
+#: ../v2v/target_RHEV.ml:233
msgid ""
"the Export Storage Domain (%s) is not writable.\n"
"\n"
@@ -2350,11 +2370,17 @@ msgid ""
"Original error was: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:275
+msgid ""
+"the number of '--rhev-vol-uuid' parameters passed on the command line has to "
+"match the number of guest disk images (for this guest: %d)"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/target_RHEV.ml:129
+#: ../v2v/target_RHEV.ml:133
msgid ""
"the virtual size of the input disk %s is not an exact multiple of 512 "
"bytes. The virtual size is: %Ld.\n"
@@ -2363,13 +2389,13 @@ msgid ""
"about this issue."
msgstr ""
-#: ../v2v/target_RHEV.ml:220
+#: ../v2v/target_RHEV.ml:222
msgid ""
"there are multiple UUIDs in the Export Storage Domain (%s). This is "
"unexpected, and may be a bug in virt-v2v or OVirt."
msgstr ""
-#: ../v2v/target_RHEV.ml:218
+#: ../v2v/target_RHEV.ml:220
msgid ""
"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
"or RHEV-M Export Storage Domain?"
@@ -2407,7 +2433,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:846
+#: ../v2v/convert_linux.ml:847
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2417,27 +2443,27 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:79
+#: ../v2v/cmdline.ml:82
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:150
+#: ../v2v/cmdline.ml:167
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:52
+#: ../v2v/cmdline.ml:55
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:61
+#: ../v2v/cmdline.ml:64
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:69
+#: ../v2v/cmdline.ml:72
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:456
+#: ../v2v/target_RHEV.ml:489
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2728,7 +2754,7 @@ msgstr ""
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: не вдалося створити елемент керування\n"
-#: align/scan.c:153 builder/index-validate.c:84 cat/cat.c:143
+#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:143
#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
#: diff/diff.c:262 edit/edit.c:162 fish/fish.c:293 format/format.c:183
#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
@@ -2760,28 +2786,28 @@ msgstr "вирівнювання < 4кБ"
msgid "alignment < 64K"
msgstr "вирівнювання < 64кБ"
-#: builder/index-validate.c:116
+#: builder/index-validate.c:117
#, c-format
msgid "%s: %s: error closing input file: %m (ignored)\n"
msgstr ""
"%s: %s: помилка під час спроби закрити файл вхідних даних: %m "
"(проігноровано)\n"
-#: builder/index-validate.c:122
+#: builder/index-validate.c:123
#, c-format
msgid "%s: '%s' could not be validated, see errors above\n"
msgstr ""
"%s: не вдалося виконати перевірку «%s», див. повідомлення про помилки, "
"виведені вище\n"
-#: builder/index-validate.c:129
+#: builder/index-validate.c:130
#, c-format
msgid "%s: %s contains comments which will not work with virt-builder 1.24.1\n"
msgstr ""
"%s: %s містить коментарі, у virt-builder 1.24.1 такі коментарі не "
"працюватимуть\n"
-#: builder/index-validate.c:142
+#: builder/index-validate.c:143
#, c-format
msgid ""
"%s: %s: section [%s] has invalid characters which will not work with virt-"
@@ -2790,7 +2816,7 @@ msgstr ""
"%s: %s: розділ [%s] містить некоректні символи, його не можна "
"використовувати у virt-builder 1.24.0\n"
-#: builder/index-validate.c:153
+#: builder/index-validate.c:154
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
@@ -2799,7 +2825,7 @@ msgstr ""
"%s: %s: розділ [%s], поле «%s» містить некоректні символи, його не можна "
"використовувати у virt-builder 1.24.0\n"
-#: builder/index-validate.c:162
+#: builder/index-validate.c:163
#, c-format
msgid ""
"%s: %s: section [%s], field '%s' has invalid characters which will not work "
@@ -2808,7 +2834,7 @@ msgstr ""
"%s: %s: розділ [%s], поле «%s» містить некоректні символи, його не можна "
"використовувати у virt-builder 1.24.1\n"
-#: builder/index-validate.c:173
+#: builder/index-validate.c:174
#, c-format
msgid ""
"%s: %s: section [%s] is missing a 'sig' field which will not work with virt-"
@@ -7933,15 +7959,15 @@ msgid "'direct' backend does not work"
msgstr "модуль «direct» не працює"
#: src/handle.c:230
-msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
-msgstr "нечислове або надто мале значення LIBGUESTFS_MEMSIZE"
+msgid "non-numeric value for LIBGUESTFS_MEMSIZE"
+msgstr ""
-#: src/handle.c:304
+#: src/handle.c:307
#, c-format
msgid "guestfs_close: called twice on the same handle\n"
msgstr "guestfs_close: викликано двічі для того самого елемента керування\n"
-#: src/handle.c:503
+#: src/handle.c:506
msgid ""
"configured --without-qemu so calling guestfs_set_qemu with qemu == NULL is "
"an error"
@@ -7949,7 +7975,12 @@ msgstr ""
"зібрано з --without-qemu, отже спроба виклику guestfs_set_qemu з qemu == "
"NULL призводить до помилки"
-#: src/handle.c:747
+#: src/handle.c:559
+#, c-format
+msgid "too small value for memsize (must be at least %d)"
+msgstr ""
+
+#: src/handle.c:754
msgid "setting not found"
msgstr ""
@@ -8064,40 +8095,40 @@ msgstr ""
"kvm» або додати поточного користувача до групи KVM (ймовірно, вам доведеться "
"вийти і знову увійти до облікового запису цього користувача)."
-#: src/launch-direct.c:287 src/launch-uml.c:159
+#: src/launch-direct.c:288 src/launch-uml.c:159
msgid "you must call guestfs_add_drive before guestfs_launch"
msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
-#: src/launch-direct.c:871 src/launch-libvirt.c:551
+#: src/launch-direct.c:866 src/launch-libvirt.c:551
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
"дорівнює READY"
-#: src/launch-direct.c:1273 src/launch-libvirt.c:1296
+#: src/launch-direct.c:1268 src/launch-libvirt.c:1302
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
-#: src/launch-direct.c:1431
+#: src/launch-direct.c:1426
msgid "discard cannot be enabled on this drive: qemu < 1.5"
msgstr "не можна вмикати discard для цього диска: qemu < 1.5"
-#: src/launch-direct.c:1440
+#: src/launch-direct.c:1435
msgid ""
"discard cannot be enabled on this drive: the drive has a read-only overlay"
msgstr ""
"не можна вмикати discard для цього диска: на диску є призначена лише для "
"читання накладка"
-#: src/launch-direct.c:1447
+#: src/launch-direct.c:1442
msgid ""
"discard cannot be enabled on this drive: you have to specify the format of "
"the file"
msgstr ""
"не можна вмикати discard для цього диска: вам слід вказати формат файла"
-#: src/launch-direct.c:1455
+#: src/launch-direct.c:1450
msgid ""
"discard cannot be enabled on this drive: qemu < 1.6 cannot do discard on "
"qcow2 files"
@@ -8105,7 +8136,7 @@ msgstr ""
"не можна вмикати discard для цього диска: у qemu < 1.6 не передбачено "
"підтримки discard для файлів qcow2"
-#: src/launch-direct.c:1463
+#: src/launch-direct.c:1458
#, c-format
msgid ""
"discard cannot be enabled on this drive: qemu does not support discard for "
@@ -8114,7 +8145,7 @@ msgstr ""
"не можна вмикати discard для цього диска: у qemu не передбачено підтримки "
"discard для файлів у форматі «%s»"
-#: src/launch-direct.c:1486
+#: src/launch-direct.c:1481
#, c-format
msgid ""
"discard cannot be enabled on this drive: protocol '%s' does not support "
@@ -8208,11 +8239,11 @@ msgstr ""
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr "%s:%d: помилка під час побудови XML для libvirt поряд з викликом «%s»"
-#: src/launch-libvirt.c:1250
+#: src/launch-libvirt.c:1256
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1379
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
@@ -8220,7 +8251,7 @@ msgstr ""
"у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
"тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
-#: src/launch-libvirt.c:1398
+#: src/launch-libvirt.c:1404
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -8232,7 +8263,7 @@ msgstr ""
"параметра «--format» або за допомогою додаткового параметра аргументу "
"формату до «add-drive»."
-#: src/launch-libvirt.c:1405
+#: src/launch-libvirt.c:1411
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -8245,20 +8276,20 @@ msgstr ""
"параметра «--format» або за допомогою додаткового параметра аргументу "
"формату до «add-drive»."
-#: src/launch-libvirt.c:1683
+#: src/launch-libvirt.c:1689
msgid "could not destroy libvirt domain"
msgstr "не вдалося знищити домен libvirt"
-#: src/launch-libvirt.c:1720 src/launch-libvirt.c:1753
+#: src/launch-libvirt.c:1726 src/launch-libvirt.c:1759
#, c-format
msgid "%s: internal error forming error message"
msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
-#: src/launch-libvirt.c:1812
+#: src/launch-libvirt.c:1818
msgid "could not attach disk to libvirt domain"
msgstr "не вдалося долучити диск до домену libvirt"
-#: src/launch-libvirt.c:1843
+#: src/launch-libvirt.c:1849
msgid "could not detach disk from libvirt domain"
msgstr "не вдалося від’єднати диск від домену libvirt"
@@ -8820,3 +8851,6 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
+
+#~ msgid "non-numeric or too small value for LIBGUESTFS_MEMSIZE"
+#~ msgstr "нечислове або надто мале значення LIBGUESTFS_MEMSIZE"
--
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