[Pkg-libvirt-commits] [libguestfs] 59/266: Version 1.27.25.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:41:42 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 59584e1814205f62e36692ad3df26adcaeddcfc8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Tue Aug 5 18:06:22 2014 +0100
Version 1.27.25.
---
BUGS | 19 ++--
configure.ac | 2 +-
po-docs/ja.po | 223 ++++++++++++++++++++++++-------------------
po-docs/libguestfs-docs.pot | 225 ++++++++++++++++++++++++-------------------
po-docs/uk.po | 223 ++++++++++++++++++++++++-------------------
po/en_GB.po | 224 ++++++++++++++++++++++++++++---------------
po/es.po | 224 ++++++++++++++++++++++++++++---------------
po/gu.po | 224 ++++++++++++++++++++++++++++---------------
po/hi.po | 224 ++++++++++++++++++++++++++++---------------
po/kn.po | 224 ++++++++++++++++++++++++++++---------------
po/libguestfs.pot | 226 +++++++++++++++++++++++++++++---------------
po/ml.po | 224 ++++++++++++++++++++++++++++---------------
po/mr.po | 224 ++++++++++++++++++++++++++++---------------
po/nl.po | 224 ++++++++++++++++++++++++++++---------------
po/or.po | 224 ++++++++++++++++++++++++++++---------------
po/pa.po | 224 ++++++++++++++++++++++++++++---------------
po/pl.po | 224 ++++++++++++++++++++++++++++---------------
po/ta.po | 224 ++++++++++++++++++++++++++++---------------
po/te.po | 224 ++++++++++++++++++++++++++++---------------
po/uk.po | 224 ++++++++++++++++++++++++++++---------------
20 files changed, 2612 insertions(+), 1442 deletions(-)
diff --git a/BUGS b/BUGS
index ba364b5..34286ad 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-07-26
+Last updated: 2014-08-05
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -329,9 +329,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1114012 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1114012
"yum install guestfish" on fresh Fedora 20 results in broken libguestfs
-1117540 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1117540
- Support virt-sparsify option to allow specifying temporary file or block device
-
1118305 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1118305
RFE: Ability to set iSCSI-Initiator-IQN for iSCSI connections
@@ -341,6 +338,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1123281 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123281
lvm-set-filter stopped working in Rawhide
+1123797 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1123797
+ libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -377,9 +377,6 @@ 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
-1123007 POST https://bugzilla.redhat.com/show_bug.cgi?id=1123007
- libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
-
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
@@ -398,7 +395,13 @@ You can help by testing the fixes.
1106548 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1106548
root gets an error accessing to a non-root dir on a snapshot guestmount VMDK img
-(11 bugs)
+1117540 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1117540
+ Support virt-sparsify option to allow specifying temporary file or block device
+
+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)
--------------------------------------------------
These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index e8055df..35c584d 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], [24])
+m4_define([libguestfs_release], [25])
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 3c30c19..30be7a9 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-07-23 17:36+0200\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:144
+#: ../v2v/virt-v2v.pod:152
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:146
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:154
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:193
+#: ../v2v/virt-v2v.pod:201
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:195
+#: ../v2v/virt-v2v.pod:203
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:197
+#: ../v2v/virt-v2v.pod:205
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:199
+#: ../v2v/virt-v2v.pod:207
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:201
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:209
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:203
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:211
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:205
+#: ../v2v/virt-v2v.pod:220
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:207
+#: ../v2v/virt-v2v.pod:222
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1487,7 +1487,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:409
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:424
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1527,7 +1527,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:421
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:436
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1557,7 +1557,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:427
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:442
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1886,7 +1886,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:346
+#: ../v2v/virt-v2v.pod:361
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1924,7 +1924,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:419
+#: ../v2v/virt-v2v.pod:434
msgid "AUTHORS"
msgstr "著者"
@@ -1954,7 +1954,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:429
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:444
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2891,7 +2891,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:308
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:323
msgid "1."
msgstr "1."
@@ -2911,7 +2911,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:315
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:330
msgid "2."
msgstr "2."
@@ -2929,7 +2929,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:321
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:336
msgid "3."
msgstr "3."
@@ -5358,7 +5358,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:283
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5393,7 +5393,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:298
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5442,7 +5442,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:369
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5456,7 +5456,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:374
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
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 +5464,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:377
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
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:381
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5485,7 +5485,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:388
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8623,7 +8623,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:407
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8762,7 +8762,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:332
+#: ../v2v/virt-v2v.pod:347
msgid "FILES"
msgstr "ファイル"
@@ -51821,7 +51821,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:423
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
msgid "Matthew Booth"
msgstr ""
@@ -53893,7 +53893,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:304
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53926,7 +53926,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:316
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53934,13 +53934,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:319
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:325
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53948,7 +53948,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:313
+#: ../v2v/virt-v2v.pod:328
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53959,7 +53959,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:317
+#: ../v2v/virt-v2v.pod:332
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 +54657,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:148
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54840,7 +54840,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:352
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54854,7 +54854,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
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 +54862,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:359
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54877,7 +54877,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87803,8 +87803,8 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:135
msgid ""
-"For I<-o rhev>, this is an NFS path of the form C<E<lt>hostE<gt>:"
-"E<lt>pathE<gt>>, eg:"
+"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
@@ -87819,41 +87819,57 @@ msgstr ""
#: ../v2v/virt-v2v.pod:140
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."
+"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
+"So you probably have to run virt-v2v as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:144
+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 "
+"directory, so virt-v2v will still need to run as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:149
+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:150
+#: ../v2v/virt-v2v.pod:158
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:160
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:162
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:164
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:166
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:168
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:170
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 "
@@ -87864,14 +87880,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:178
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:173
+#: ../v2v/virt-v2v.pod:181
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 "
@@ -87880,7 +87896,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:186
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 "
@@ -87888,7 +87904,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:190
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 "
@@ -87897,7 +87913,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:195
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 "
@@ -87906,13 +87922,26 @@ msgid ""
"first VirtIO disk."
msgstr ""
+#. type: =item
+#: ../v2v/virt-v2v.pod:213
+msgid "B<--vmtype> server|desktop"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:215
+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 "
+"default is chosen based on the detected guest operating system."
+msgstr ""
+
#. type: =head1
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:226
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:228
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 "
@@ -87921,7 +87950,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87929,7 +87958,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:237
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87937,7 +87966,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:239
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87950,7 +87979,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:246
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87959,7 +87988,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:249
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87971,7 +88000,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:255
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87980,7 +88009,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:258
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87988,19 +88017,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:260
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:262
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:250
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -88008,7 +88037,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:270
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 "
@@ -88016,7 +88045,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:275
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88024,7 +88053,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:277
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88032,7 +88061,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:279
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88042,7 +88071,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:283
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88050,7 +88079,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:285
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88058,7 +88087,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:287
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88066,7 +88095,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:289
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88074,7 +88103,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88082,7 +88111,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:278
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88090,7 +88119,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:280
+#: ../v2v/virt-v2v.pod:295
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88099,7 +88128,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:300
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 "
@@ -88107,14 +88136,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:306
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:294
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88124,7 +88153,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:338
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 "
@@ -88132,36 +88161,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:344
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:336
+#: ../v2v/virt-v2v.pod:351
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338 ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:355
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:350
+#: ../v2v/virt-v2v.pod:365
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:376
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 "
@@ -88171,31 +88200,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:386
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:383
+#: ../v2v/virt-v2v.pod:398
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:400
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:390
+#: ../v2v/virt-v2v.pod:405
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:409
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. "
@@ -88205,20 +88234,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:415
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:426
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:425
+#: ../v2v/virt-v2v.pod:440
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index ae05083..fe6ef2b 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.23\n"
+"Project-Id-Version: libguestfs 1.27.25\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-07-23 17:36+0200\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:144
+#: ../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
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:146
+#: ../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
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:197
+#: ../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
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 ""
@@ -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:346
+#: ../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
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:321
+#: ../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
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:283
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
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:298
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
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:369
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
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:374
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
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:377
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
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:381
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
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:388
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
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:407
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
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:332
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:347
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:423
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
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:289
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:304
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:301
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:316
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:304
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:319
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:310
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:325
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:313
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:328
#, 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:317
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:332
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:148
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
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:352
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
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:355
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
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:359
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50305,7 +50305,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78603,8 +78603,8 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:135
msgid ""
-"For I<-o rhev>, this is an NFS path of the form "
-"C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
+"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
@@ -78619,41 +78619,57 @@ msgstr ""
#: ../v2v/virt-v2v.pod:140
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."
+"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
+"So you probably have to run virt-v2v as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:144
+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 "
+"directory, so virt-v2v will still need to run as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:149
+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:150
+#: ../v2v/virt-v2v.pod:158
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:160
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:162
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:164
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:166
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:168
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:170
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 "
@@ -78664,14 +78680,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:178
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:173
+#: ../v2v/virt-v2v.pod:181
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 "
@@ -78680,7 +78696,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:186
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 "
@@ -78688,7 +78704,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:190
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 "
@@ -78697,7 +78713,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:195
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 "
@@ -78706,13 +78722,26 @@ msgid ""
"first VirtIO disk."
msgstr ""
+#. type: =item
+#: ../v2v/virt-v2v.pod:213
+msgid "B<--vmtype> server|desktop"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:215
+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 "
+"default is chosen based on the detected guest operating system."
+msgstr ""
+
#. type: =head1
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:226
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:228
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 "
@@ -78721,7 +78750,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -78729,7 +78758,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:237
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -78737,7 +78766,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:239
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -78750,7 +78779,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:246
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -78759,7 +78788,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:249
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -78771,7 +78800,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:255
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -78780,7 +78809,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:258
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -78788,19 +78817,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:260
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:262
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:250
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -78808,7 +78837,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:270
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 "
@@ -78816,7 +78845,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:275
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -78824,7 +78853,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:277
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -78832,7 +78861,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:279
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -78842,7 +78871,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:283
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -78850,7 +78879,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:285
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -78858,7 +78887,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:287
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -78866,7 +78895,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:289
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -78874,7 +78903,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -78882,7 +78911,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:278
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -78890,7 +78919,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:280
+#: ../v2v/virt-v2v.pod:295
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -78899,7 +78928,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:300
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 "
@@ -78907,14 +78936,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:306
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:294
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -78924,7 +78953,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:338
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 "
@@ -78932,36 +78961,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:344
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:336
+#: ../v2v/virt-v2v.pod:351
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338 ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:355
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:350
+#: ../v2v/virt-v2v.pod:365
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:376
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 "
@@ -78971,31 +79000,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:386
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:383
+#: ../v2v/virt-v2v.pod:398
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:400
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:390
+#: ../v2v/virt-v2v.pod:405
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:409
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. "
@@ -79005,20 +79034,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:415
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:426
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:425
+#: ../v2v/virt-v2v.pod:440
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 56d557d..e57b8a2 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-07-23 17:36+0200\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:144
+#: ../v2v/virt-v2v.pod:152
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:146
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:154
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:193
+#: ../v2v/virt-v2v.pod:201
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:195
+#: ../v2v/virt-v2v.pod:203
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:197
+#: ../v2v/virt-v2v.pod:205
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:199
+#: ../v2v/virt-v2v.pod:207
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:201
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:209
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:203
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:211
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:205
+#: ../v2v/virt-v2v.pod:220
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:207
+#: ../v2v/virt-v2v.pod:222
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1457,7 +1457,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:409
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:424
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1497,7 +1497,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:421
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:436
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1527,7 +1527,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:427
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:442
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1843,7 +1843,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:346
+#: ../v2v/virt-v2v.pod:361
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1881,7 +1881,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:419
+#: ../v2v/virt-v2v.pod:434
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1911,7 +1911,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:429
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:444
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2900,7 +2900,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:308
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:323
msgid "1."
msgstr "1."
@@ -2920,7 +2920,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:315
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:330
msgid "2."
msgstr "2."
@@ -2938,7 +2938,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:321
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:336
msgid "3."
msgstr "3."
@@ -5503,7 +5503,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:283
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:298
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5538,7 +5538,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:298
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:313
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5587,7 +5587,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:369
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:384
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5601,7 +5601,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:374
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:389
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 +5609,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:377
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:392
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:381
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:396
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5630,7 +5630,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:388
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:403
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8690,7 +8690,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:407
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:422
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8825,7 +8825,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:332
+#: ../v2v/virt-v2v.pod:347
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50839,7 +50839,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:423
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:438
msgid "Matthew Booth"
msgstr ""
@@ -52843,7 +52843,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:304
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52876,7 +52876,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:301
+#: ../v2v/virt-v2v.pod:316
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52884,13 +52884,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:304
+#: ../v2v/virt-v2v.pod:319
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:310
+#: ../v2v/virt-v2v.pod:325
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52898,7 +52898,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:313
+#: ../v2v/virt-v2v.pod:328
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52909,7 +52909,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:317
+#: ../v2v/virt-v2v.pod:332
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 +53585,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:148
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:156
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53765,7 +53765,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:352
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:367
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53779,7 +53779,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:370
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 +53787,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:359
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:374
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53802,7 +53802,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:367
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:382
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86726,8 +86726,8 @@ msgstr ""
#. type: textblock
#: ../v2v/virt-v2v.pod:135
msgid ""
-"For I<-o rhev>, this is an NFS path of the form C<E<lt>hostE<gt>:"
-"E<lt>pathE<gt>>, eg:"
+"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
@@ -86742,41 +86742,57 @@ msgstr ""
#: ../v2v/virt-v2v.pod:140
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."
+"virt-v2v, since the virt-v2v program has to actually mount it when it runs. "
+"So you probably have to run virt-v2v as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:144
+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 "
+"directory, so virt-v2v will still need to run as C<root>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:149
+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:150
+#: ../v2v/virt-v2v.pod:158
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:160
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:162
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:156
+#: ../v2v/virt-v2v.pod:164
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:158
+#: ../v2v/virt-v2v.pod:166
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:160
+#: ../v2v/virt-v2v.pod:168
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:162
+#: ../v2v/virt-v2v.pod:170
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 "
@@ -86787,14 +86803,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:178
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:173
+#: ../v2v/virt-v2v.pod:181
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 "
@@ -86803,7 +86819,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:178
+#: ../v2v/virt-v2v.pod:186
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 "
@@ -86811,7 +86827,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:182
+#: ../v2v/virt-v2v.pod:190
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 "
@@ -86820,7 +86836,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:195
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 "
@@ -86829,13 +86845,26 @@ msgid ""
"first VirtIO disk."
msgstr ""
+#. type: =item
+#: ../v2v/virt-v2v.pod:213
+msgid "B<--vmtype> server|desktop"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:215
+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 "
+"default is chosen based on the detected guest operating system."
+msgstr ""
+
#. type: =head1
-#: ../v2v/virt-v2v.pod:211
+#: ../v2v/virt-v2v.pod:226
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:228
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 "
@@ -86844,7 +86873,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:218
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -86852,7 +86881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:222
+#: ../v2v/virt-v2v.pod:237
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -86860,7 +86889,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:239
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -86873,7 +86902,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:246
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -86882,7 +86911,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:249
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -86894,7 +86923,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:240
+#: ../v2v/virt-v2v.pod:255
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -86903,7 +86932,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:258
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -86911,19 +86940,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:260
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:262
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:250
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -86931,7 +86960,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:270
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 "
@@ -86939,7 +86968,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:275
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -86947,7 +86976,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:277
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -86955,7 +86984,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:279
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -86965,7 +86994,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:268
+#: ../v2v/virt-v2v.pod:283
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -86973,7 +87002,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:270
+#: ../v2v/virt-v2v.pod:285
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -86981,7 +87010,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:287
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -86989,7 +87018,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:274
+#: ../v2v/virt-v2v.pod:289
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -86997,7 +87026,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:276
+#: ../v2v/virt-v2v.pod:291
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87005,7 +87034,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:278
+#: ../v2v/virt-v2v.pod:293
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87013,7 +87042,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:280
+#: ../v2v/virt-v2v.pod:295
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87022,7 +87051,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:300
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 "
@@ -87030,14 +87059,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:306
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:294
+#: ../v2v/virt-v2v.pod:309
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -87047,7 +87076,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:323
+#: ../v2v/virt-v2v.pod:338
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 "
@@ -87055,36 +87084,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:329
+#: ../v2v/virt-v2v.pod:344
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:336
+#: ../v2v/virt-v2v.pod:351
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:338 ../v2v/virt-v2v.pod:392
+#: ../v2v/virt-v2v.pod:353 ../v2v/virt-v2v.pod:407
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:355
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:350
+#: ../v2v/virt-v2v.pod:365
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:376
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 "
@@ -87094,31 +87123,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:371
+#: ../v2v/virt-v2v.pod:386
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:383
+#: ../v2v/virt-v2v.pod:398
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:400
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:390
+#: ../v2v/virt-v2v.pod:405
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:409
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. "
@@ -87128,20 +87157,20 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:400
+#: ../v2v/virt-v2v.pod:415
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:426
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:425
+#: ../v2v/virt-v2v.pod:440
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index f650ac7..7e8e8af 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6470,28 +6542,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 63200c8..1b97567 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -649,19 +649,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -733,7 +737,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -745,11 +749,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -769,7 +773,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -797,7 +801,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -836,7 +840,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -888,7 +892,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -965,7 +969,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -976,7 +980,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -984,7 +988,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1130,7 +1134,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,7 +1176,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1187,7 +1191,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1196,7 +1200,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1308,10 +1312,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1501,7 +1509,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1605,7 +1613,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1635,7 +1643,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1647,15 +1655,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1703,6 +1711,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1882,7 +1894,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1920,13 +1932,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2000,13 +2012,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2016,7 +2028,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2057,19 +2076,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2087,11 +2106,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2152,7 +2171,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2168,13 +2187,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2192,22 +2219,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2215,7 +2242,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2223,7 +2250,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2279,7 +2306,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2291,7 +2318,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2307,11 +2334,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2319,7 +2383,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2327,7 +2391,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2343,7 +2407,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2353,22 +2417,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2564,11 +2636,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6591,28 +6663,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 1c9cee9..e17b44f 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -648,19 +648,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -732,7 +736,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -744,11 +748,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -768,7 +772,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -796,7 +800,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -835,7 +839,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -887,7 +891,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -964,7 +968,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -975,7 +979,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -983,7 +987,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1129,7 +1133,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,7 +1175,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1186,7 +1190,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1195,7 +1199,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1307,10 +1311,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1500,7 +1508,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1604,7 +1612,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1634,7 +1642,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1646,15 +1654,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1702,6 +1710,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1881,7 +1893,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1919,13 +1931,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1999,13 +2011,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2015,7 +2027,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2056,19 +2075,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2086,11 +2105,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2151,7 +2170,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2167,13 +2186,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2191,22 +2218,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2214,7 +2241,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2222,7 +2249,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2278,7 +2305,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2290,7 +2317,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2306,11 +2333,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2318,7 +2382,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2326,7 +2390,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2342,7 +2406,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2352,22 +2416,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2563,11 +2635,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6447,28 +6519,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 07aa00b..8a9e34d 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -648,19 +648,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -732,7 +736,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -744,11 +748,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -768,7 +772,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -796,7 +800,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -835,7 +839,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -887,7 +891,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -964,7 +968,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -975,7 +979,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -983,7 +987,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1129,7 +1133,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,7 +1175,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1186,7 +1190,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1195,7 +1199,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1307,10 +1311,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1500,7 +1508,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1604,7 +1612,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1634,7 +1642,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1646,15 +1654,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1702,6 +1710,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1881,7 +1893,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1919,13 +1931,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1999,13 +2011,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2015,7 +2027,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2056,19 +2075,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2086,11 +2105,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2151,7 +2170,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2167,13 +2186,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2191,22 +2218,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2214,7 +2241,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2222,7 +2249,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2278,7 +2305,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2290,7 +2317,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2306,11 +2333,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2318,7 +2382,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2326,7 +2390,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2342,7 +2406,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2352,22 +2416,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2563,11 +2635,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6445,28 +6517,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index a96ae4b..b3eabb4 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6449,28 +6521,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index faebaa4..a756abc 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.23\n"
+"Project-Id-Version: libguestfs 1.27.25\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -78,7 +78,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -219,7 +219,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -269,7 +269,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -646,19 +646,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -730,7 +734,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -742,11 +746,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -766,7 +770,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -794,7 +798,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -833,7 +837,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -885,7 +889,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -962,7 +966,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -973,7 +977,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -981,7 +985,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1127,7 +1131,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1169,7 +1173,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1184,7 +1188,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1193,7 +1197,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1305,10 +1309,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1498,7 +1506,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1602,7 +1610,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1632,7 +1640,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1644,15 +1652,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1700,6 +1708,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1879,7 +1891,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1917,13 +1929,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1997,13 +2009,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2013,7 +2025,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2054,19 +2073,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2084,11 +2103,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2149,7 +2168,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2165,13 +2184,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2189,22 +2216,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2212,7 +2239,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2220,7 +2247,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2276,7 +2303,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2288,7 +2315,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2304,11 +2331,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2316,7 +2380,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2324,7 +2388,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2340,7 +2404,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2350,22 +2414,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2561,11 +2633,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6435,28 +6507,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index f8aa659..cf75b17 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6447,28 +6519,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index efecadf..40737db 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -648,19 +648,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -732,7 +736,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -744,11 +748,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -768,7 +772,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -796,7 +800,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -835,7 +839,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -887,7 +891,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -964,7 +968,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -975,7 +979,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -983,7 +987,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1129,7 +1133,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,7 +1175,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1186,7 +1190,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1195,7 +1199,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1307,10 +1311,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1500,7 +1508,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1604,7 +1612,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1634,7 +1642,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1646,15 +1654,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1702,6 +1710,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1881,7 +1893,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1919,13 +1931,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1999,13 +2011,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2015,7 +2027,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2056,19 +2075,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2086,11 +2105,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2151,7 +2170,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2167,13 +2186,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2191,22 +2218,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2214,7 +2241,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2222,7 +2249,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2278,7 +2305,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2290,7 +2317,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2306,11 +2333,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2318,7 +2382,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2326,7 +2390,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2342,7 +2406,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2352,22 +2416,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2563,11 +2635,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6514,28 +6586,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index d2ef5b9..564a18b 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -649,19 +649,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -733,7 +737,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -745,11 +749,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -769,7 +773,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -797,7 +801,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -836,7 +840,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -888,7 +892,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -965,7 +969,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -976,7 +980,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -984,7 +988,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1130,7 +1134,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,7 +1176,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1187,7 +1191,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1196,7 +1200,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1308,10 +1312,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1501,7 +1509,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1605,7 +1613,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1635,7 +1643,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1647,15 +1655,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1703,6 +1711,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1882,7 +1894,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1920,13 +1932,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2000,13 +2012,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2016,7 +2028,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2057,19 +2076,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2087,11 +2106,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2152,7 +2171,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2168,13 +2187,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2192,22 +2219,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2215,7 +2242,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2223,7 +2250,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2279,7 +2306,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2291,7 +2318,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2307,11 +2334,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2319,7 +2383,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2327,7 +2391,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2343,7 +2407,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2353,22 +2417,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2564,11 +2636,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6624,28 +6696,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/or.po b/po/or.po
index a05ee35..36b0b4c 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6445,28 +6517,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 41b88bb..d19fbe3 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -80,7 +80,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -221,7 +221,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -271,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -648,19 +648,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -732,7 +736,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -744,11 +748,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -768,7 +772,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -796,7 +800,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -835,7 +839,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -887,7 +891,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -964,7 +968,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -975,7 +979,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -983,7 +987,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1129,7 +1133,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1171,7 +1175,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1186,7 +1190,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1195,7 +1199,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1307,10 +1311,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1500,7 +1508,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1604,7 +1612,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1634,7 +1642,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1646,15 +1654,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1702,6 +1710,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1881,7 +1893,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1919,13 +1931,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1999,13 +2011,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2015,7 +2027,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2056,19 +2075,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2086,11 +2105,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2151,7 +2170,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2167,13 +2186,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2191,22 +2218,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2214,7 +2241,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2222,7 +2249,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2278,7 +2305,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2290,7 +2317,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2306,11 +2333,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2318,7 +2382,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2326,7 +2390,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2342,7 +2406,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2352,22 +2416,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2563,11 +2635,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6511,28 +6583,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 15c6051..8d39541 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -83,7 +83,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -651,19 +651,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -735,7 +739,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -747,11 +751,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -771,7 +775,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
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:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -838,7 +842,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../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:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../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:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../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:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../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:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1132,7 +1136,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1174,7 +1178,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1189,7 +1193,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1198,7 +1202,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1310,10 +1314,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1503,7 +1511,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1607,7 +1615,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1637,7 +1645,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1649,15 +1657,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1705,6 +1713,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1884,7 +1896,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1922,13 +1934,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2002,13 +2014,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2018,7 +2030,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2059,19 +2078,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2089,11 +2108,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2154,7 +2173,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2170,13 +2189,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2194,22 +2221,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2217,7 +2244,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2225,7 +2252,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2281,7 +2308,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2293,7 +2320,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2309,11 +2336,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2321,7 +2385,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2329,7 +2393,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2345,7 +2409,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2355,22 +2419,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2566,11 +2638,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6642,28 +6714,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 1170017..67a350a 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6446,28 +6518,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/te.po b/po/te.po
index bde6b60..bdc2bbe 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -79,7 +79,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -270,7 +270,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -647,19 +647,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -731,7 +735,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -743,11 +747,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -767,7 +771,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -795,7 +799,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -834,7 +838,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -886,7 +890,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -963,7 +967,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -974,7 +978,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -982,7 +986,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1128,7 +1132,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1170,7 +1174,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1185,7 +1189,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1194,7 +1198,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1306,10 +1310,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1499,7 +1507,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1603,7 +1611,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1633,7 +1641,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1645,15 +1653,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1701,6 +1709,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1880,7 +1892,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1918,13 +1930,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -1998,13 +2010,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2014,7 +2026,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2055,19 +2074,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2085,11 +2104,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2150,7 +2169,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2166,13 +2185,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2190,22 +2217,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2213,7 +2240,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2221,7 +2248,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2277,7 +2304,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2289,7 +2316,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2305,11 +2332,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2317,7 +2381,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2325,7 +2389,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2341,7 +2405,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2351,22 +2415,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2562,11 +2634,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6443,28 +6515,28 @@ msgstr ""
msgid "%s: %s command failed\n"
msgstr ""
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr ""
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
msgstr ""
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr ""
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr ""
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index d46b585..3070c06 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-07-26 21:28+0100\n"
+"POT-Creation-Date: 2014-08-05 18:04+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:1096
+#: ../v2v/convert_linux.ml:1083
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -81,7 +81,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:144
msgid "%s: %s (ignored)"
msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
msgid "%s: cannot output to a character device or /dev/null\n"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:109
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -272,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:354 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:367 ../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:347 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:360 ../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:350 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:363 ../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:372 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:385 ../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:360 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:373 ../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:369 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:382 ../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:366 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:379 ../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:363 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:376 ../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:357 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -649,19 +649,23 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:179
+#: ../v2v/cmdline.ml:199 ../v2v/cmdline.ml:190
+msgid "--vmtype option can only be used with '-o rhev'"
+msgstr ""
+
+#: ../v2v/cmdline.ml:188
msgid "-o libvirt: do not use the -os option"
msgstr ""
-#: ../v2v/cmdline.ml:183
+#: ../v2v/cmdline.ml:194
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:190
+#: ../v2v/cmdline.ml:203
msgid "-o local: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:185
+#: ../v2v/cmdline.ml:196
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
@@ -733,7 +737,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:147
msgid "Closing the overlay"
msgstr ""
@@ -745,11 +749,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:109
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:109
+#: ../v2v/v2v.ml:107
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -769,7 +773,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:166
+#: ../v2v/v2v.ml:164
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -797,7 +801,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:191
+#: ../v2v/v2v.ml:189
msgid "Creating output metadata"
msgstr ""
@@ -836,7 +840,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:83 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:84 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -888,7 +892,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:99 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:100 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -965,7 +969,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:98 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -976,7 +980,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:101 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:103 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -984,7 +988,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:289
+#: ../v2v/v2v.ml:291
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1130,7 +1134,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:97
msgid "How to choose root filesystem"
msgstr ""
@@ -1172,7 +1176,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../v2v/cmdline.ml:85
+#: ../v2v/cmdline.ml:91 ../v2v/cmdline.ml:86
msgid "Libvirt URI"
msgstr ""
@@ -1187,7 +1191,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:86 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:87 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1196,7 +1200,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:87 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:88 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1308,10 +1312,14 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:95 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
+#: ../v2v/target_RHEV.ml:503 ../v2v/target_RHEV.ml:137
+msgid "RHEV does not support the output format '%s', only raw or qcow2"
+msgstr ""
+
#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1501,7 +1509,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:93
msgid "Rename guest when converting"
msgstr ""
@@ -1605,7 +1613,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:84
+#: ../v2v/cmdline.ml:85
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1635,7 +1643,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:89
+#: ../v2v/cmdline.ml:90
msgid "Set output allocation mode"
msgstr ""
@@ -1647,15 +1655,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:92
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:88
+#: ../v2v/cmdline.ml:89
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:93
+#: ../v2v/cmdline.ml:94
msgid "Set output storage location"
msgstr ""
@@ -1703,6 +1711,10 @@ msgstr ""
msgid "Set user password"
msgstr ""
+#: ../v2v/cmdline.ml:102
+msgid "Set vmtype (for RHEV)"
+msgstr ""
+
#: ../customize/customize_run.ml:150
msgid "Setting a random seed"
msgstr ""
@@ -1882,7 +1894,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:138
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -1920,13 +1932,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:615
+#: ../v2v/convert_linux.ml:602
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:530
+#: ../v2v/convert_linux.ml:517
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2000,13 +2012,13 @@ msgstr ""
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
-#: ../v2v/convert_windows.ml:113
+#: ../v2v/convert_windows.ml:110
msgid ""
"cannot uninstall Xen PV drivers: registry key 'HKLM\\SOFTWARE\\Microsoft"
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:292
+#: ../v2v/v2v.ml:294
msgid "connection closed"
msgstr ""
@@ -2016,7 +2028,14 @@ msgid ""
"\\CurrentVersion"
msgstr ""
-#: ../v2v/convert_linux.ml:1003
+#: ../v2v/target_RHEV.ml:206
+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
msgid "could not update grub2 console: %s (ignored)"
msgstr ""
@@ -2057,19 +2076,19 @@ msgstr ""
msgid "domain"
msgstr ""
-#: ../v2v/lib_linux.ml:151
+#: ../v2v/lib_linux.ml:150
msgid "don't know how to find file owner using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:130
+#: ../v2v/lib_linux.ml:129
msgid "don't know how to get list of files from package using %s"
msgstr ""
-#: ../v2v/lib_linux.ml:115
+#: ../v2v/lib_linux.ml:114
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:276
+#: ../v2v/v2v.ml:278
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2087,11 +2106,11 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:171
+#: ../v2v/cmdline.ml:180
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:163
+#: ../v2v/cmdline.ml:172
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2152,7 +2171,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:314
+#: ../v2v/v2v.ml:316
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 "
@@ -2168,13 +2187,21 @@ msgstr ""
msgid "lv"
msgstr ""
-#: ../v2v/v2v.ml:299
+#: ../v2v/target_RHEV.ml:183
+msgid ""
+"mount command failed, see earlier errors.\n"
+"\n"
+"This probably means you didn't specify the right Export Storage Domain path "
+"[-os %s], or else you need to rerun virt-v2v as root."
+msgstr ""
+
+#: ../v2v/v2v.ml:301
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:203
+#: ../v2v/convert_linux.ml:190
msgid ""
"multiple files in /boot could be the initramfs matching %s %s. This could "
"be a bug in virt-v2v."
@@ -2192,22 +2219,22 @@ msgstr ""
msgid "no cache directory\n"
msgstr ""
-#: ../v2v/convert_linux.ml:108
+#: ../v2v/convert_linux.ml:95
msgid "no grub1/grub-legacy or grub2 configuration file was found"
msgstr ""
-#: ../v2v/convert_linux.ml:198
+#: ../v2v/convert_linux.ml:185
msgid "no initrd was found in /boot matching %s %s."
msgstr ""
-#: ../v2v/convert_linux.ml:264
+#: ../v2v/convert_linux.ml:251
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:375
+#: ../v2v/convert_linux.ml:362
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2215,7 +2242,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:269
+#: ../v2v/v2v.ml:271
msgid "no root device found in this operating system image."
msgstr ""
@@ -2223,7 +2250,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:730
+#: ../v2v/convert_linux.ml:717
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2279,7 +2306,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:187 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:185 ../v2v/v2v.ml:73
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2291,7 +2318,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:309
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2307,11 +2334,48 @@ msgstr ""
msgid "sectors"
msgstr ""
+#: ../v2v/target_RHEV.ml:226
+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
+msgid ""
+"the Export Storage Domain (%s) is not writable.\n"
+"\n"
+"This probably means you need to run virt-v2v as 'root'.\n"
+"\n"
+"Original error was: %s"
+msgstr ""
+
#: ../resize/resize.ml:445
msgid "the source disk has no partitions"
msgstr ""
-#: ../v2v/convert_windows.ml:256
+#: ../v2v/target_RHEV.ml:129
+msgid ""
+"the virtual size of the input disk %s is not an exact multiple of 512 "
+"bytes. The virtual size is: %Ld.\n"
+"\n"
+"This probably means something unexpected is going on, so please file a bug "
+"about this issue."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:220
+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
+msgid ""
+"there are no UUIDs in the Export Storage Domain (%s). Is it really an OVirt "
+"or RHEV-M Export Storage Domain?"
+msgstr ""
+
+#: ../v2v/convert_windows.ml:253
msgid ""
"there are no virtio drivers available for this version of Windows (%d.%d "
"%s). virt-v2v looks for drivers in %s\n"
@@ -2319,7 +2383,7 @@ msgid ""
"The guest will be configured to use slower emulated devices."
msgstr ""
-#: ../v2v/convert_windows.ml:265
+#: ../v2v/convert_windows.ml:263
msgid ""
"there is no viostor (virtio block device) driver for this version of Windows "
"(%d.%d %s). virt-v2v looks for this driver here: %s\n"
@@ -2327,7 +2391,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/convert_windows.ml:281
+#: ../v2v/convert_windows.ml:280
msgid ""
"there is no virtio network driver for this version of Windows (%d.%d %s). "
"virt-v2v looks for this driver here: %s\n"
@@ -2343,7 +2407,7 @@ msgstr ""
msgid "timezone could not be set for this type of guest"
msgstr ""
-#: ../v2v/convert_linux.ml:859
+#: ../v2v/convert_linux.ml:846
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -2353,22 +2417,30 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:78
+#: ../v2v/cmdline.ml:79
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:51
+#: ../v2v/cmdline.ml:150
+msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
+msgstr ""
+
+#: ../v2v/cmdline.ml:52
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:60
+#: ../v2v/cmdline.ml:61
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:68
+#: ../v2v/cmdline.ml:69
msgid "unknown -oa option: %s"
msgstr ""
+#: ../v2v/target_RHEV.ml:456
+msgid "unknown guest operating system: %s %s %d.%d (%s)"
+msgstr ""
+
#. ../customize/customize_main.ml:81
#. ../customize/customize_main.ml:80
#: ../sysprep/main.ml:134 ../sysprep/main.ml:133
@@ -2564,11 +2636,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:131
+#: ../v2v/v2v.ml:129
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:137
+#: ../v2v/v2v.ml:135
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -6915,12 +6987,12 @@ msgstr "%s: підтримку NTFS було вимкнено під час зб
msgid "%s: %s command failed\n"
msgstr "%s: не вдалося виконати команду %s\n"
-#: make-fs/make-fs.c:426
+#: make-fs/make-fs.c:430
#, c-format
msgid "%s: cannot parse the output of 'du' command: %s\n"
msgstr "%s: не вдалося виконати обробку результатів виконання команди du: %s\n"
-#: make-fs/make-fs.c:461
+#: make-fs/make-fs.c:465
#, c-format
msgid ""
"%s: %s: input is not a directory, tar archive or compressed tar archive\n"
@@ -6928,17 +7000,17 @@ msgstr ""
"%s: %s: вхідний об’єкт не є каталогом, архівом tar або стисненим архівом "
"tar\n"
-#: make-fs/make-fs.c:492
+#: make-fs/make-fs.c:496
#, c-format
msgid "%s: %s: unknown compressed input format (%s)\n"
msgstr "%s: %s: невідомий формат стискання вхідних даних (%s)\n"
-#: make-fs/make-fs.c:615
+#: make-fs/make-fs.c:619
#, c-format
msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
msgstr "%s: %s: некоректний параметр розміру «%s» (%s повернуто %d)\n"
-#: make-fs/make-fs.c:815
+#: make-fs/make-fs.c:819
#, c-format
msgid "%s: subprocess failed\n"
msgstr "%s: помилка підпроцесу\n"
--
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