[Pkg-libvirt-commits] [libguestfs] 132/266: Version 1.27.28.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:41:52 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 bcce760166f3a377376c030fba0a5e7d86e4f005
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Tue Aug 19 19:46:24 2014 +0100
Version 1.27.28.
---
BUGS | 2 +-
configure.ac | 2 +-
po-docs/ja.po | 473 +++++++++++++++++++++++++------------------
po-docs/libguestfs-docs.pot | 451 +++++++++++++++++++++++------------------
po-docs/uk.po | 478 ++++++++++++++++++++++++++------------------
po/en_GB.po | 223 ++++++++++++---------
po/es.po | 223 ++++++++++++---------
po/gu.po | 223 ++++++++++++---------
po/hi.po | 223 ++++++++++++---------
po/kn.po | 223 ++++++++++++---------
po/libguestfs.pot | 225 ++++++++++++---------
po/ml.po | 223 ++++++++++++---------
po/mr.po | 223 ++++++++++++---------
po/nl.po | 223 ++++++++++++---------
po/or.po | 223 ++++++++++++---------
po/pa.po | 223 ++++++++++++---------
po/pl.po | 223 ++++++++++++---------
po/ta.po | 223 ++++++++++++---------
po/te.po | 223 ++++++++++++---------
po/uk.po | 223 ++++++++++++---------
20 files changed, 2799 insertions(+), 1954 deletions(-)
diff --git a/BUGS b/BUGS
index 67ae802..e1216af 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-15
+Last updated: 2014-08-19
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
diff --git a/configure.ac b/configure.ac
index 59ce1cb..4cbb5ec 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], [27])
+m4_define([libguestfs_release], [28])
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 e734308..6ed0bdf 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-15 16:36+0200\n"
+"POT-Creation-Date: 2014-08-19 17:51+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/"
@@ -139,7 +139,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:11 ../src/guestfs.pod:22
#: ../sysprep/virt-sysprep.pod:11 ../test-tool/libguestfs-test-tool.pod:9
#: ../tools/virt-list-filesystems:42 ../tools/virt-list-partitions:42
-#: ../tools/virt-tar:74 ../tools/virt-win-reg:60 ../v2v/virt-v2v.pod:14
+#: ../tools/virt-tar:74 ../tools/virt-win-reg:60 ../v2v/virt-v2v.pod:16
msgid "DESCRIPTION"
msgstr "説明"
@@ -395,7 +395,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:27
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:29
msgid "OPTIONS"
msgstr "オプション"
@@ -414,7 +414,7 @@ msgstr "オプション"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:31
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:33
msgid "B<--help>"
msgstr "B<--help>"
@@ -718,7 +718,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:171
+#: ../v2v/virt-v2v.pod:193
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:173
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:195
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:258
+#: ../v2v/virt-v2v.pod:280
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:260
+#: ../v2v/virt-v2v.pod:282
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:262
+#: ../v2v/virt-v2v.pod:284
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:264
+#: ../v2v/virt-v2v.pod:286
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:266
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:288
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:268
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:290
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:277
+#: ../v2v/virt-v2v.pod:301
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:279
+#: ../v2v/virt-v2v.pod:303
msgid "Enable tracing of libguestfs API calls."
msgstr "libguestfs API 呼び出しのトレースを有効にします。"
@@ -1406,9 +1406,9 @@ msgstr "このプログラムは以下を返します:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:187 ../v2v/virt-v2v.pod:191
-#: ../v2v/virt-v2v.pod:195 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:416
-#: ../v2v/virt-v2v.pod:421
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:209 ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:217 ../v2v/virt-v2v.pod:435 ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:445
msgid "*"
msgstr "*"
@@ -1489,7 +1489,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:554
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:584
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1529,7 +1529,7 @@ msgstr "著者"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:566
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:599
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1559,7 +1559,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:572
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:605
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
@@ -1888,7 +1888,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:491
+#: ../v2v/virt-v2v.pod:521
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1926,7 +1926,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:564
+#: ../v2v/virt-v2v.pod:597
msgid "AUTHORS"
msgstr "著者"
@@ -1956,7 +1956,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:574
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:607
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2405,7 +2405,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:33
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -2788,13 +2788,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:65
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:67
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2893,7 +2893,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:380 ../v2v/virt-v2v.pod:432
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:404 ../v2v/virt-v2v.pod:456
msgid "1."
msgstr "1."
@@ -2913,7 +2913,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:387 ../v2v/virt-v2v.pod:446
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:470
msgid "2."
msgstr "2."
@@ -2931,8 +2931,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:393
-#: ../v2v/virt-v2v.pod:454
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:417
+#: ../v2v/virt-v2v.pod:478
msgid "3."
msgstr "3."
@@ -2947,7 +2947,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:469
+#: ../v2v/virt-v2v.pod:499
msgid "4."
msgstr "4."
@@ -5362,7 +5362,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
msgid "MACHINE READABLE OUTPUT"
msgstr "マシン可読な出力"
@@ -5397,7 +5397,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:370
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5446,7 +5446,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:514
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5460,7 +5460,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:519
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5468,13 +5468,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:522
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
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:526
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5489,7 +5489,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:533
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8627,7 +8627,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:552
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr "他の環境変数は L<guestfs(3)/環境変数> を参照してください。"
@@ -8766,7 +8766,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:507
msgid "FILES"
msgstr "ファイル"
@@ -51825,7 +51825,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:568
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
msgid "Matthew Booth"
msgstr ""
@@ -53411,7 +53411,7 @@ msgstr "デバッグメッセージを有効にします。"
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:35
+#: ../v2v/virt-v2v.pod:37
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -53897,7 +53897,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:385
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53930,7 +53930,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:373
+#: ../v2v/virt-v2v.pod:397
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53938,13 +53938,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:400
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:382
+#: ../v2v/virt-v2v.pod:406
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53952,7 +53952,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:409
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53963,7 +53963,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:389
+#: ../v2v/virt-v2v.pod:413
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54661,7 +54661,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:175
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54844,7 +54844,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:497
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54858,7 +54858,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:500
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -54866,7 +54866,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:504
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54881,7 +54881,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:512
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -82620,7 +82620,9 @@ msgstr "テスト用の一般的なブロックデバイス。"
#. type: =item
#: ../src/guestfs.pod:3947
-msgid "C</dev/sdb> 50MB"
+#, fuzzy
+#| msgid "C</dev/sdb> 50MB"
+msgid "C</dev/sdb> 500MB"
msgstr "C</dev/sdb> 50MB"
#. type: textblock
@@ -87568,8 +87570,16 @@ msgid ""
"\n"
msgstr ""
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:14
+#, no-wrap
+msgid ""
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:16
+#: ../v2v/virt-v2v.pod:18
msgid ""
"Virt-v2v converts guests from a foreign hypervisor to run on KVM, managed by "
"libvirt or Red Hat Enterprise Virtualisation (RHEV) version 2.2 or later. It "
@@ -87578,55 +87588,77 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:21
+#: ../v2v/virt-v2v.pod:23
msgid ""
"There is also a companion front-end called L<virt-p2v(1)> which comes as an "
"ISO or CD image that can be booted on physical machines."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:24
+#: ../v2v/virt-v2v.pod:26
msgid ""
"This manual page documents the rewritten virt-v2v included in libguestfs "
"E<ge> 1.28."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:37
+#: ../v2v/virt-v2v.pod:39
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:41
+#: ../v2v/virt-v2v.pod:43
+#, fuzzy
+#| msgid "B<-i>"
+msgid "B<-i disk>"
+msgstr "B<-i>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid "Set the input method to I<disk>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:47
+msgid ""
+"In this mode you can read a virtual machine disk image with no metadata. "
+"virt-v2v tries to guess the best default metadata. This is usually adequate "
+"but you can get finer control (eg. of memory and vCPUs) by using I<-i "
+"libvirtxml> instead. Only guests that use a single disk can be imported "
+"this way."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:53
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:55
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:57
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:48
+#: ../v2v/virt-v2v.pod:60
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:50
+#: ../v2v/virt-v2v.pod:62
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:52
+#: ../v2v/virt-v2v.pod:64
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -87634,40 +87666,68 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:69
+#, fuzzy
+#| msgid "B<-i>"
+msgid "B<-i local>"
+msgstr "B<-i>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:71
+#, fuzzy
+#| msgid "This is the same as the tune2fs C<-e> option."
+msgid "This is the same as I<-i disk>."
+msgstr "これは tune2fs C<-e> オプションと同じです。"
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:73
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:59
+#: ../v2v/virt-v2v.pod:75
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:78
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:81
+#, fuzzy
+#| msgid "B<--format>"
+msgid "B<-if> format"
+msgstr "B<--format>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:83
+msgid ""
+"For I<-i disk> only, this specifies the format of the input disk image. For "
+"other input methods you should specify the input format in the metadata."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:93
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:76
+#: ../v2v/virt-v2v.pod:98
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -87675,48 +87735,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:102
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:105
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:85
+#: ../v2v/virt-v2v.pod:107
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:87
+#: ../v2v/virt-v2v.pod:109
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:112
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "以下の L</1 MB パーティションアライメント> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:92
+#: ../v2v/virt-v2v.pod:114
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:94
+#: ../v2v/virt-v2v.pod:116
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:96
+#: ../v2v/virt-v2v.pod:118
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -87724,7 +87784,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:122
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -87734,38 +87794,38 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:126
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:129
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o option>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:131
#, fuzzy
#| msgid "This is the same as the tune2fs C<-e> option."
msgid "This is the same as I<-o rhev>."
msgstr "これは tune2fs C<-e> オプションと同じです。"
#. type: =item
-#: ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:133
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:135
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:137
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -87774,97 +87834,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:142
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:144
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:146
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:148
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:128
+#: ../v2v/virt-v2v.pod:150
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:153
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:156
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:158
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:160
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:162
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:164
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:167
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:147
+#: ../v2v/virt-v2v.pod:169
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:171
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:174
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:176
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:157
+#: ../v2v/virt-v2v.pod:179
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87872,7 +87932,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:181
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. "
@@ -87880,7 +87940,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:185
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 "
@@ -87888,112 +87948,112 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:190
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:177
+#: ../v2v/virt-v2v.pod:199
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:201
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:203
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:183
+#: ../v2v/virt-v2v.pod:205
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:211
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:215
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:219
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:223
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:225
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:228
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:235
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:237
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:239
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:241
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:243
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:245
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:247
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:249
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 "
@@ -88004,14 +88064,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:257
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:238
+#: ../v2v/virt-v2v.pod:260
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 "
@@ -88020,7 +88080,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -88028,7 +88088,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -88037,7 +88097,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:252
+#: ../v2v/virt-v2v.pod:274
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 "
@@ -88047,25 +88107,32 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:270
-msgid "B<--vmtype> server|desktop"
+#: ../v2v/virt-v2v.pod:292
+msgid "B<--vmtype desktop>"
msgstr ""
+#. type: =item
+#: ../v2v/virt-v2v.pod:294
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--vmtype server>"
+msgstr "B<--merge>"
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:296
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 "
+"C<desktop> or C<server>. If the option is not given, then a suitable "
"default is chosen based on the detected guest operating system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:309
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 "
@@ -88074,7 +88141,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:314
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -88082,7 +88149,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:318
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -88090,7 +88157,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:320
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -88103,7 +88170,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -88112,7 +88179,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:330
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88124,7 +88191,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:336
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88133,7 +88200,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:315
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88141,19 +88208,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:317
+#: ../v2v/virt-v2v.pod:341
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:319
+#: ../v2v/virt-v2v.pod:343
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:322
+#: ../v2v/virt-v2v.pod:346
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 "
@@ -88161,7 +88228,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
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 "
@@ -88169,7 +88236,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88177,7 +88244,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88185,7 +88252,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88195,7 +88262,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88203,7 +88270,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:366
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88211,7 +88278,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:368
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88219,7 +88286,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88227,7 +88294,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88235,7 +88302,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88243,7 +88310,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88252,7 +88319,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
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 "
@@ -88260,14 +88327,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:363
+#: ../v2v/virt-v2v.pod:387
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:366
+#: ../v2v/virt-v2v.pod:390
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88277,7 +88344,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:419
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 "
@@ -88285,59 +88352,59 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
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: =head1
-#: ../v2v/virt-v2v.pod:404
+#: ../v2v/virt-v2v.pod:428
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:430
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:442
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:447
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:451
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:434
+#: ../v2v/virt-v2v.pod:458
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:461
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -88345,14 +88412,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:439
+#: ../v2v/virt-v2v.pod:463
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</tmp> called:"
msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -88361,17 +88428,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -88381,14 +88448,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:456
+#: ../v2v/virt-v2v.pod:480
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -88400,25 +88467,32 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:465
-msgid "and change I<only> the E<lt>sourceE<gt> element to:"
+#: ../v2v/virt-v2v.pod:489
+msgid ""
+"and change two things: The C<type='file'> attribute must be changed to "
+"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
+"include C<pool> and C<volume> attributes:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
+" <disk type='volume' device='disk'>\n"
+" ...\n"
" <source pool='POOL' volume='NAME-sda' />\n"
+" ...\n"
+" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:501
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:503
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
@@ -88426,29 +88500,29 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:511
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:483 ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:515
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:495
+#: ../v2v/virt-v2v.pod:525
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:536
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 "
@@ -88458,31 +88532,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:546
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:558
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:560
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:535
+#: ../v2v/virt-v2v.pod:565
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:569
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. "
@@ -88492,20 +88566,27 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:575
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:586
+#, fuzzy
+#| msgid ""
+#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
+#| "fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
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/>."
+"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
+"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
+"L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-fs(1)>, "
+"L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:603
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index ce6cc1d..b31bccd 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.27\n"
+"Project-Id-Version: libguestfs 1.27.28\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-15 16:36+0200\n"
+"POT-Creation-Date: 2014-08-19 17:51+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"
@@ -57,7 +57,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:13 ../appliance/libguestfs-make-fixed-appliance.pod:11 ../builder/virt-builder.pod:32 ../builder/virt-index-validate.pod:9 ../cat/virt-cat.pod:17 ../cat/virt-filesystems.pod:11 ../cat/virt-log.pod:11 ../cat/virt-ls.pod:17 ../customize/virt-customize.pod:13 ../daemon/guestfsd.pod:9 ../df/virt-df.pod:23 ../diff/virt-diff.pod:11 ../edit/virt-edit.pod:25 ../erlang/examples/guestfs-erlang.pod:14 ../examples/guestfs-examples.pod:17 ../examples/guestfs-perfor [...]
+#: ../align/virt-alignment-scan.pod:13 ../appliance/libguestfs-make-fixed-appliance.pod:11 ../builder/virt-builder.pod:32 ../builder/virt-index-validate.pod:9 ../cat/virt-cat.pod:17 ../cat/virt-filesystems.pod:11 ../cat/virt-log.pod:11 ../cat/virt-ls.pod:17 ../customize/virt-customize.pod:13 ../daemon/guestfsd.pod:9 ../df/virt-df.pod:23 ../diff/virt-diff.pod:11 ../edit/virt-edit.pod:25 ../erlang/examples/guestfs-erlang.pod:14 ../examples/guestfs-examples.pod:17 ../examples/guestfs-perfor [...]
msgid "DESCRIPTION"
msgstr ""
@@ -246,12 +246,12 @@ msgid "If you just want the exit code with no output, use the I<-q> option."
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
+#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:174 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
+#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:178 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
msgid "B<--help>"
msgstr ""
@@ -421,12 +421,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178 ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507 ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211 ../v2v/virt-v2v.pod:171
+#: ../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:193
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:173
+#: ../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:195
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:262
+#: ../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:284
msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:497 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:206 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:201 ../rescue/virt-rescue.pod:248 ../resize/virt-re [...]
msgid "Display version number and exit."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:503 ../cat/virt-cat.pod:177 ../cat/virt-filesystems.pod:285 ../cat/virt-log.pod:124 ../cat/virt-ls.pod:467 ../customize/virt-customize.pod:202 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:215 ../fish/guestfish.pod:441 ../format/virt-format.pod:175 ../fuse/guestmount.pod:380 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:259 ../resize/virt-resize.pod: [...]
msgid "B<-x>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
+#: ../align/virt-alignment-scan.pod:207 ../builder/virt-builder.pod:505 ../cat/virt-cat.pod:179 ../cat/virt-filesystems.pod:287 ../cat/virt-log.pod:126 ../cat/virt-ls.pod:469 ../customize/virt-customize.pod:204 ../df/virt-df.pod:197 ../diff/virt-diff.pod:214 ../edit/virt-edit.pod:217 ../format/virt-format.pod:177 ../inspector/virt-inspector.pod:130 ../rescue/virt-rescue.pod:261 ../resize/virt-resize.pod:591 ../sparsify/virt-sparsify.pod:306 ../sysprep/virt-sysprep.pod:233 ../v2v/virt-v2v [...]
msgid "Enable tracing of libguestfs API calls."
msgstr ""
@@ -774,7 +774,7 @@ msgid "This program returns:"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:781 ../builder/virt-builder.pod:788 ../builder/virt-b [...]
msgid "*"
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1688 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:246 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:251 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1709 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:265 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:507 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v.pod:213 ../rescue/virt-resc [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1711 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:267 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1129,7 +1129,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:159 ../builder/virt-builder.pod:1624 ../customize/virt-customize.pod:216 ../edit/virt-edit.pod:371 ../fish/guestfish.pod:1385 ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388 ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644 ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175 ../v2v/virt-v2v.pod:491
+#: ../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:521
msgid "ENVIRONMENT VARIABLES"
msgstr ""
@@ -1148,7 +1148,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:263 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1253 ../examples/guestfs-performance.pod:569 ../examples/guestfs-recipes.pod:674 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1636 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238 ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280 [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1593,7 +1593,7 @@ msgid "You can combine these options, and have multiple options of all types."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:33
+#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
msgid "Display help."
msgstr ""
@@ -1969,12 +1969,12 @@ msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:65
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
msgid "B<--machine-readable>"
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:67
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2061,7 +2061,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
+#: ../builder/virt-builder.pod:388 ../builder/virt-builder.pod:835 ../customize/virt-customize.pod:155 ../examples/guestfs-faq.pod:483 ../examples/guestfs-faq.pod:712 ../examples/guestfs-performance.pod:159 ../examples/guestfs-performance.pod:201 ../examples/guestfs-recipes.pod:406 ../p2v-iso/guestfs-p2v-iso.pod:117 ../rescue/virt-rescue.pod:326 ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623 ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485 ../src/guestfs.pod:1819 ../s [...]
msgid "1."
msgstr ""
@@ -2073,7 +2073,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
+#: ../builder/virt-builder.pod:393 ../builder/virt-builder.pod:840 ../customize/virt-customize.pod:160 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:722 ../examples/guestfs-performance.pod:165 ../examples/guestfs-performance.pod:208 ../examples/guestfs-recipes.pod:412 ../p2v-iso/guestfs-p2v-iso.pod:124 ../rescue/virt-rescue.pod:334 ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630 ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491 ../src/guestfs.pod:1823 ../s [...]
msgid "2."
msgstr ""
@@ -2085,7 +2085,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:398 ../builder/virt-builder.pod:848 ../customize/virt-customize.pod:165 ../examples/guestfs-faq.pod:494 ../examples/guestfs-faq.pod:727 ../examples/guestfs-performance.pod:214 ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343 ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636 ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502 ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:393 ../v2v/virt-v2v.pod:454
+#: ../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:417 ../v2v/virt-v2v.pod:478
msgid "3."
msgstr ""
@@ -2098,7 +2098,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:469
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:499
msgid "4."
msgstr ""
@@ -4505,7 +4505,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:355
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
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:370
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
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:514
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
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:519
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
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:522
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
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:526
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
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:533
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
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:552
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
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:477
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:507
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:568
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
msgid "Matthew Booth"
msgstr ""
@@ -48953,7 +48953,7 @@ msgid "Enable debugging messages."
msgstr ""
#. type: =item
-#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:35
+#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:37
msgid "B<--debug-gc>"
msgstr ""
@@ -49401,7 +49401,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:361
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:385
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:373
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:397
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:376
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:400
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:382
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:406
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:385
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:409
#, 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:389
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:413
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:175
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
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:497
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
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:500
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
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:504
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50305,7 +50305,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:512
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -73759,7 +73759,7 @@ msgstr ""
#. type: =item
#: ../src/guestfs.pod:3947
-msgid "C</dev/sdb> 50MB"
+msgid "C</dev/sdb> 500MB"
msgstr ""
#. type: textblock
@@ -78364,8 +78364,16 @@ msgid ""
"\n"
msgstr ""
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:14
+#, no-wrap
+msgid ""
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
+msgstr ""
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:16
+#: ../v2v/virt-v2v.pod:18
msgid ""
"Virt-v2v converts guests from a foreign hypervisor to run on KVM, managed by "
"libvirt or Red Hat Enterprise Virtualisation (RHEV) version 2.2 or later. It "
@@ -78374,55 +78382,75 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:21
+#: ../v2v/virt-v2v.pod:23
msgid ""
"There is also a companion front-end called L<virt-p2v(1)> which comes as an "
"ISO or CD image that can be booted on physical machines."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:24
+#: ../v2v/virt-v2v.pod:26
msgid ""
"This manual page documents the rewritten virt-v2v included in libguestfs "
"E<ge> 1.28."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:37
+#: ../v2v/virt-v2v.pod:39
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:41
+#: ../v2v/virt-v2v.pod:43
+msgid "B<-i disk>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid "Set the input method to I<disk>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:47
+msgid ""
+"In this mode you can read a virtual machine disk image with no metadata. "
+"virt-v2v tries to guess the best default metadata. This is usually adequate "
+"but you can get finer control (eg. of memory and vCPUs) by using I<-i "
+"libvirtxml> instead. Only guests that use a single disk can be imported "
+"this way."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:53
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:55
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:57
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:48
+#: ../v2v/virt-v2v.pod:60
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:50
+#: ../v2v/virt-v2v.pod:62
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:52
+#: ../v2v/virt-v2v.pod:64
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -78430,38 +78458,60 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:69
+msgid "B<-i local>"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:71
+msgid "This is the same as I<-i disk>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:73
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:59
+#: ../v2v/virt-v2v.pod:75
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:78
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:81
+msgid "B<-if> format"
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:83
+msgid ""
+"For I<-i disk> only, this specifies the format of the input disk image. For "
+"other input methods you should specify the input format in the metadata."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:93
msgid "B<--no-copy>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:76
+#: ../v2v/virt-v2v.pod:98
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -78469,46 +78519,46 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:102
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:105
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:85
+#: ../v2v/virt-v2v.pod:107
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:87
+#: ../v2v/virt-v2v.pod:109
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:112
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:92
+#: ../v2v/virt-v2v.pod:114
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:94
+#: ../v2v/virt-v2v.pod:116
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:96
+#: ../v2v/virt-v2v.pod:118
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -78516,7 +78566,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:122
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -78526,34 +78576,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:126
msgid ""
"and a libvirt XML file is created containing guest metadata "
"(C</dir/name.xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:129
msgid "B<-o ovirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:131
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:133
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:135
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:137
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -78562,97 +78612,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:142
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:144
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:146
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:148
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:128
+#: ../v2v/virt-v2v.pod:150
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:153
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:156
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:158
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:160
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:162
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:164
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:167
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:147
+#: ../v2v/virt-v2v.pod:169
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:171
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
"pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:174
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:176
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:157
+#: ../v2v/virt-v2v.pod:179
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -78660,7 +78710,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:181
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. "
@@ -78668,7 +78718,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:185
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 "
@@ -78676,110 +78726,110 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:190
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:177
+#: ../v2v/virt-v2v.pod:199
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:201
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:203
msgid "B<--rhev-vm-uuid> UUID"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:183
+#: ../v2v/virt-v2v.pod:205
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:211
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:215
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:219
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:223
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:225
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:228
msgid ""
"If the guest has more than one virtual disk, then you should use "
"I<--rhev-vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:235
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:237
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:239
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:241
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:243
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:245
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:247
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:249
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 "
@@ -78790,14 +78840,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:257
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:238
+#: ../v2v/virt-v2v.pod:260
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 "
@@ -78806,7 +78856,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -78814,7 +78864,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -78823,7 +78873,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:252
+#: ../v2v/virt-v2v.pod:274
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 "
@@ -78833,25 +78883,30 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:270
-msgid "B<--vmtype> server|desktop"
+#: ../v2v/virt-v2v.pod:292
+msgid "B<--vmtype desktop>"
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:294
+msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:296
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 "
+"C<desktop> or C<server>. If the option is not given, then a suitable "
"default is chosen based on the detected guest operating system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:309
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 "
@@ -78860,7 +78915,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:314
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -78868,7 +78923,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:318
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -78876,7 +78931,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:320
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -78889,7 +78944,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -78898,7 +78953,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:330
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -78910,7 +78965,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:336
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -78919,7 +78974,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:315
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -78927,19 +78982,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:317
+#: ../v2v/virt-v2v.pod:341
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:319
+#: ../v2v/virt-v2v.pod:343
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:322
+#: ../v2v/virt-v2v.pod:346
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 "
@@ -78947,7 +79002,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
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 "
@@ -78955,7 +79010,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -78963,7 +79018,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -78971,7 +79026,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -78981,7 +79036,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -78989,7 +79044,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:366
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -78997,7 +79052,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:368
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -79005,7 +79060,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -79013,7 +79068,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -79021,7 +79076,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -79029,7 +79084,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -79038,7 +79093,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
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 "
@@ -79046,14 +79101,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:363
+#: ../v2v/virt-v2v.pod:387
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:366
+#: ../v2v/virt-v2v.pod:390
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -79063,7 +79118,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:419
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 "
@@ -79071,59 +79126,59 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
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: =head1
-#: ../v2v/virt-v2v.pod:404
+#: ../v2v/virt-v2v.pod:428
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:430
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a "
"libvirt-managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:442
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:447
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:451
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:434
+#: ../v2v/virt-v2v.pod:458
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:461
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -79131,12 +79186,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:439
+#: ../v2v/virt-v2v.pod:463
msgid "This creates two (or more) files in C</tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -79145,17 +79200,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -79165,14 +79220,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:456
+#: ../v2v/virt-v2v.pod:480
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -79184,25 +79239,32 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:465
-msgid "and change I<only> the E<lt>sourceE<gt> element to:"
+#: ../v2v/virt-v2v.pod:489
+msgid ""
+"and change two things: The C<type='file'> attribute must be changed to "
+"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
+"include C<pool> and C<volume> attributes:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
+" <disk type='volume' device='disk'>\n"
+" ...\n"
" <source pool='POOL' volume='NAME-sda' />\n"
+" ...\n"
+" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:501
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:503
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
@@ -79210,29 +79272,29 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:511
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:483 ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:515
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:495
+#: ../v2v/virt-v2v.pod:525
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:536
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 "
@@ -79242,31 +79304,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:546
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:558
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:560
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:535
+#: ../v2v/virt-v2v.pod:565
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:569
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. "
@@ -79276,20 +79338,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:575
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:586
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/>."
+"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
+"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
+"L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:603
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index b03f4b9..b782051 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-15 16:36+0200\n"
+"POT-Creation-Date: 2014-08-19 17:51+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/"
@@ -137,7 +137,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:11 ../src/guestfs.pod:22
#: ../sysprep/virt-sysprep.pod:11 ../test-tool/libguestfs-test-tool.pod:9
#: ../tools/virt-list-filesystems:42 ../tools/virt-list-partitions:42
-#: ../tools/virt-tar:74 ../tools/virt-win-reg:60 ../v2v/virt-v2v.pod:14
+#: ../tools/virt-tar:74 ../tools/virt-win-reg:60 ../v2v/virt-v2v.pod:16
msgid "DESCRIPTION"
msgstr "ОПИС"
@@ -397,7 +397,7 @@ msgstr ""
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
-#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:27
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:29
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
@@ -416,7 +416,7 @@ msgstr "ПАРАМЕТРИ"
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
-#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:31
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:33
msgid "B<--help>"
msgstr "B<--help>"
@@ -731,7 +731,7 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:177 ../customize/virt-customize.pod:178
#: ../fuse/guestunmount.pod:83 ../resize/virt-resize.pod:507
#: ../sparsify/virt-sparsify.pod:243 ../sysprep/virt-sysprep.pod:211
-#: ../v2v/virt-v2v.pod:171
+#: ../v2v/virt-v2v.pod:193
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:173
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:195
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:258
+#: ../v2v/virt-v2v.pod:280
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:260
+#: ../v2v/virt-v2v.pod:282
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:262
+#: ../v2v/virt-v2v.pod:284
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:264
+#: ../v2v/virt-v2v.pod:286
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:266
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:288
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:268
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:290
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:277
+#: ../v2v/virt-v2v.pod:301
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:279
+#: ../v2v/virt-v2v.pod:303
msgid "Enable tracing of libguestfs API calls."
msgstr "Увімкнути трасування викликів програмного інтерфейсу libguestfs."
@@ -1380,9 +1380,9 @@ msgstr "Ця програма повертає:"
#: ../sysprep/virt-sysprep.pod:411 ../tools/virt-win-reg:194
#: ../tools/virt-win-reg:199 ../tools/virt-win-reg:205
#: ../tools/virt-win-reg:754 ../tools/virt-win-reg:760
-#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:187 ../v2v/virt-v2v.pod:191
-#: ../v2v/virt-v2v.pod:195 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:416
-#: ../v2v/virt-v2v.pod:421
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:209 ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:217 ../v2v/virt-v2v.pod:435 ../v2v/virt-v2v.pod:440
+#: ../v2v/virt-v2v.pod:445
msgid "*"
msgstr "*"
@@ -1459,7 +1459,7 @@ msgstr ""
#: ../sparsify/virt-sparsify.pod:439 ../src/guestfs.pod:4752
#: ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:180
#: ../tools/virt-list-filesystems:181 ../tools/virt-list-partitions:263
-#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:554
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:584
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1499,7 +1499,7 @@ msgstr "АВТОР"
#: ../resize/virt-resize.pod:776 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:567 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
-#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:566
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:599
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1529,7 +1529,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../sparsify/virt-sparsify.pod:456 ../src/guestfs.pod:4816
#: ../sysprep/virt-sysprep.pod:571 ../test-tool/libguestfs-test-tool.pod:190
#: ../tools/virt-list-filesystems:197 ../tools/virt-list-partitions:278
-#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:572
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:605
msgid "COPYRIGHT"
msgstr "АВТОРСЬКІ ПРАВА"
@@ -1845,7 +1845,7 @@ msgstr ""
#: ../fuse/guestunmount.pod:113 ../rescue/virt-rescue.pod:388
#: ../sparsify/virt-sparsify.pod:395 ../src/guestfs.pod:4644
#: ../sysprep/virt-sysprep.pod:518 ../test-tool/libguestfs-test-tool.pod:175
-#: ../v2v/virt-v2v.pod:491
+#: ../v2v/virt-v2v.pod:521
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1883,7 +1883,7 @@ msgstr ""
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4812
#: ../sysprep/virt-sysprep.pod:565 ../test-tool/libguestfs-test-tool.pod:186
-#: ../v2v/virt-v2v.pod:564
+#: ../v2v/virt-v2v.pod:597
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1913,7 +1913,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../guestfs-release-notes.pod:3023 ../p2v-iso/guestfs-p2v-iso.pod:238
#: ../p2v/virt-p2v.pod:219 ../rescue/virt-rescue.pod:428
#: ../src/guestfs.pod:4818 ../test-tool/libguestfs-test-tool.pod:192
-#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:574
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:607
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2409,7 +2409,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v.pod:184 ../resize/virt-resize.pod:272
-#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:33
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:35
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -2799,13 +2799,13 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441
-#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:65
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:87
msgid "B<--machine-readable>"
msgstr "B<--machine-readable>"
#. type: textblock
#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443
-#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:67
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:89
msgid ""
"This option is used to make the output more machine friendly when being "
"parsed by other programs. See L</MACHINE READABLE OUTPUT> below."
@@ -2902,7 +2902,7 @@ msgstr ""
#: ../resize/virt-resize.pod:29 ../resize/virt-resize.pod:623
#: ../sparsify/virt-sparsify.pod:366 ../src/guestfs.pod:485
#: ../src/guestfs.pod:1819 ../src/guestfs.pod:2091 ../src/guestfs.pod:2389
-#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:380 ../v2v/virt-v2v.pod:432
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:404 ../v2v/virt-v2v.pod:456
msgid "1."
msgstr "1."
@@ -2922,7 +2922,7 @@ msgstr ""
#: ../resize/virt-resize.pod:42 ../resize/virt-resize.pod:630
#: ../sparsify/virt-sparsify.pod:373 ../src/guestfs.pod:491
#: ../src/guestfs.pod:1823 ../src/guestfs.pod:2095 ../src/guestfs.pod:2393
-#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:387 ../v2v/virt-v2v.pod:446
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:411 ../v2v/virt-v2v.pod:470
msgid "2."
msgstr "2."
@@ -2940,8 +2940,8 @@ msgstr ""
#: ../examples/guestfs-recipes.pod:418 ../rescue/virt-rescue.pod:343
#: ../resize/virt-resize.pod:50 ../resize/virt-resize.pod:636
#: ../sparsify/virt-sparsify.pod:379 ../src/guestfs.pod:502
-#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:393
-#: ../v2v/virt-v2v.pod:454
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:417
+#: ../v2v/virt-v2v.pod:478
msgid "3."
msgstr "3."
@@ -2956,7 +2956,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172
#: ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59
-#: ../v2v/virt-v2v.pod:469
+#: ../v2v/virt-v2v.pod:499
msgid "4."
msgstr "4."
@@ -5507,7 +5507,7 @@ msgstr ""
#. type: =head1
#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595
-#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:355
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:379
msgid "MACHINE READABLE OUTPUT"
msgstr ""
@@ -5542,7 +5542,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613
-#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:370
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:394
msgid ""
"A list of features is printed, one per line, and the program exits with "
"status 0."
@@ -5591,7 +5591,7 @@ msgstr ""
#. type: =item
#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220
-#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:514
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:544
msgid "C<VIRT_TOOLS_DATA_DIR>"
msgstr ""
@@ -5605,7 +5605,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225
-#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:519
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:549
msgid ""
"Normally you do not need to set this. If not set, a compiled-in default "
"will be used (something like C</usr/share/virt-tools>)."
@@ -5613,13 +5613,13 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228
-#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:522
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:552
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:526
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:556
msgid "C<rhsrvany.exe>"
msgstr ""
@@ -5634,7 +5634,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238
-#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:533
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:563
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -8694,7 +8694,7 @@ msgstr ""
#. type: textblock
#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426
-#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:552
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:582
msgid ""
"For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>."
msgstr ""
@@ -8829,7 +8829,7 @@ msgstr ""
#. type: =head1
#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537
#: ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393
-#: ../v2v/virt-v2v.pod:477
+#: ../v2v/virt-v2v.pod:507
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50843,7 +50843,7 @@ msgid "L<virt-v2v(1)>, L<qemu-nbd(1)>, L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:568
+#: ../p2v/virt-p2v.pod:215 ../v2v/virt-v2v.pod:601
msgid "Matthew Booth"
msgstr ""
@@ -52382,7 +52382,7 @@ msgstr "Увімкнути показ діагностичних повідом
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:35
+#: ../v2v/virt-v2v.pod:37
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -52847,7 +52847,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:361
+#: ../v2v/virt-v2v.pod:385
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52880,7 +52880,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:373
+#: ../v2v/virt-v2v.pod:397
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52888,13 +52888,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:400
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:382
+#: ../v2v/virt-v2v.pod:406
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52902,7 +52902,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:385
+#: ../v2v/virt-v2v.pod:409
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52913,7 +52913,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:389
+#: ../v2v/virt-v2v.pod:413
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53589,7 +53589,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:175
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:197
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53769,7 +53769,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:497
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:527
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53783,7 +53783,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:500
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:530
msgid ""
"You should ensure there is enough free space in the worst case for a full "
"copy of the source disk (I<virtual> size), or else set C<$TMPDIR> to point "
@@ -53791,7 +53791,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:504
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:534
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53806,7 +53806,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:512
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:542
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -81698,7 +81698,9 @@ msgstr ""
#. type: =item
#: ../src/guestfs.pod:3947
-msgid "C</dev/sdb> 50MB"
+#, fuzzy
+#| msgid "C</dev/sdb> 50MB"
+msgid "C</dev/sdb> 500MB"
msgstr "C</dev/sdb> 50 МБ"
#. type: textblock
@@ -86491,8 +86493,21 @@ msgid ""
"\n"
msgstr ""
+#. type: verbatim
+#: ../v2v/virt-v2v.pod:14
+#, fuzzy, no-wrap
+#| msgid ""
+#| " virt-builder fedora-20 -o mydisk.img\n"
+#| "\n"
+msgid ""
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
+msgstr ""
+" virt-builder fedora-20 -o mydisk.img\n"
+"\n"
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:16
+#: ../v2v/virt-v2v.pod:18
msgid ""
"Virt-v2v converts guests from a foreign hypervisor to run on KVM, managed by "
"libvirt or Red Hat Enterprise Virtualisation (RHEV) version 2.2 or later. It "
@@ -86501,55 +86516,77 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:21
+#: ../v2v/virt-v2v.pod:23
msgid ""
"There is also a companion front-end called L<virt-p2v(1)> which comes as an "
"ISO or CD image that can be booted on physical machines."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:24
+#: ../v2v/virt-v2v.pod:26
msgid ""
"This manual page documents the rewritten virt-v2v included in libguestfs "
"E<ge> 1.28."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:37
+#: ../v2v/virt-v2v.pod:39
msgid ""
"Debug garbage collection and memory allocation. This is only useful when "
"debugging memory problems in virt-v2v or the OCaml libguestfs bindings."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:41
+#: ../v2v/virt-v2v.pod:43
+#, fuzzy
+#| msgid "B<gdisk>"
+msgid "B<-i disk>"
+msgstr "B<gdisk>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:45
+msgid "Set the input method to I<disk>."
+msgstr ""
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:47
+msgid ""
+"In this mode you can read a virtual machine disk image with no metadata. "
+"virt-v2v tries to guess the best default metadata. This is usually adequate "
+"but you can get finer control (eg. of memory and vCPUs) by using I<-i "
+"libvirtxml> instead. Only guests that use a single disk can be imported "
+"this way."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:53
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:43
+#: ../v2v/virt-v2v.pod:55
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:45
+#: ../v2v/virt-v2v.pod:57
msgid ""
"In this mode you have to specify a libvirt guest name on the command line. "
"You may also specify a libvirt connection URI (see I<-ic>)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:48
+#: ../v2v/virt-v2v.pod:60
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:50
+#: ../v2v/virt-v2v.pod:62
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:52
+#: ../v2v/virt-v2v.pod:64
msgid ""
"In this mode you have to pass a libvirt XML file on the command line. This "
"file is read in order to get metadata about the source guest (such as its "
@@ -86557,40 +86594,66 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:57
+#: ../v2v/virt-v2v.pod:69
+#, fuzzy
+#| msgid "B<-i>"
+msgid "B<-i local>"
+msgstr "B<-i>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:71
+msgid "This is the same as I<-i disk>."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:73
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:59
+#: ../v2v/virt-v2v.pod:75
msgid ""
"Specify a libvirt connection URI to use when reading the guest. This is "
"only used when S<I<-i libvirt>>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:62
+#: ../v2v/virt-v2v.pod:78
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:71
+#: ../v2v/virt-v2v.pod:81
+#, fuzzy
+#| msgid "B<--format>"
+msgid "B<-if> format"
+msgstr "B<--format>"
+
+#. type: textblock
+#: ../v2v/virt-v2v.pod:83
+msgid ""
+"For I<-i disk> only, this specifies the format of the input disk image. For "
+"other input methods you should specify the input format in the metadata."
+msgstr ""
+
+#. type: =item
+#: ../v2v/virt-v2v.pod:93
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:73
+#: ../v2v/virt-v2v.pod:95
msgid ""
"Don't copy the disks. Instead, conversion is performed (and thrown away), "
"and metadata is written, but no disks are created."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:76
+#: ../v2v/virt-v2v.pod:98
msgid ""
"This is useful in two cases: Either you want to test if conversion is likely "
"to succeed, without the long copying process. Or you are only interested in "
@@ -86598,48 +86661,48 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:80
+#: ../v2v/virt-v2v.pod:102
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:83
+#: ../v2v/virt-v2v.pod:105
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:85
+#: ../v2v/virt-v2v.pod:107
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:87
+#: ../v2v/virt-v2v.pod:109
msgid ""
"In this mode, the converted guest is created as a libvirt guest. You may "
"also specify a libvirt connection URI (see I<-oc>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:90
+#: ../v2v/virt-v2v.pod:112
#, fuzzy
#| msgid "see L</1 MB PARTITION ALIGNMENT> below."
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr "див. L</ВИРІВНЮВАННЯ РОЗДІЛІВ НА ПОЗНАЧКИ 1 МБ> нижче."
#. type: =item
-#: ../v2v/virt-v2v.pod:92
+#: ../v2v/virt-v2v.pod:114
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:94
+#: ../v2v/virt-v2v.pod:116
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:96
+#: ../v2v/virt-v2v.pod:118
msgid ""
"In this mode, the converted guest is written to a local directory specified "
"by I<-os /dir> (the directory must exist). The converted guest's disks are "
@@ -86647,7 +86710,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:100
+#: ../v2v/virt-v2v.pod:122
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -86657,36 +86720,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:104
+#: ../v2v/virt-v2v.pod:126
msgid ""
"and a libvirt XML file is created containing guest metadata (C</dir/name."
"xml>, where C<name> is the guest name)."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:107
+#: ../v2v/virt-v2v.pod:129
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o параметр>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:109
+#: ../v2v/virt-v2v.pod:131
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:111
+#: ../v2v/virt-v2v.pod:133
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:113
+#: ../v2v/virt-v2v.pod:135
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:137
msgid ""
"The converted guest is written to a RHEV Export Storage Domain. The I<-os> "
"parameter must also be used to specify the location of the Export Storage "
@@ -86695,97 +86758,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:142
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:122
+#: ../v2v/virt-v2v.pod:144
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:124
+#: ../v2v/virt-v2v.pod:146
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:126
+#: ../v2v/virt-v2v.pod:148
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:128
+#: ../v2v/virt-v2v.pod:150
msgid ""
"Specify a libvirt connection to use when writing the converted guest. This "
"is only used when S<I<-o libvirt>>. See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:131
+#: ../v2v/virt-v2v.pod:153
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:134
+#: ../v2v/virt-v2v.pod:156
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:136
+#: ../v2v/virt-v2v.pod:158
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:138
+#: ../v2v/virt-v2v.pod:160
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:140
+#: ../v2v/virt-v2v.pod:162
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:142
+#: ../v2v/virt-v2v.pod:164
msgid ""
"Rename the guest when converting it. If this option is not used then the "
"output name is the same as the input name."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:167
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:147
+#: ../v2v/virt-v2v.pod:169
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:149
+#: ../v2v/virt-v2v.pod:171
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:152
+#: ../v2v/virt-v2v.pod:174
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:154
+#: ../v2v/virt-v2v.pod:176
msgid ""
"For I<-o rhev>, this can be an NFS path of the Export Storage Domain of the "
"form C<E<lt>hostE<gt>:E<lt>pathE<gt>>, eg:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:157
+#: ../v2v/virt-v2v.pod:179
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -86793,7 +86856,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:181
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. "
@@ -86801,7 +86864,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:185
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 "
@@ -86809,112 +86872,112 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:190
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:177
+#: ../v2v/virt-v2v.pod:199
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:201
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:203
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:183
+#: ../v2v/virt-v2v.pod:205
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:211
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:193
+#: ../v2v/virt-v2v.pod:215
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:197
+#: ../v2v/virt-v2v.pod:219
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:201
+#: ../v2v/virt-v2v.pod:223
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:225
msgid ""
"You can use I<--rhev-image-uuid> and I<--rhev-vm-uuid> on the command line "
"at most once."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:206
+#: ../v2v/virt-v2v.pod:228
msgid ""
"If the guest has more than one virtual disk, then you should use I<--rhev-"
"vol-uuid> multiple times to change the UUID of each guest disk."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:210
+#: ../v2v/virt-v2v.pod:232
msgid ""
"The format of UUIDs is: C<12345678-1234-1234-1234-123456789abc> (each hex "
"digit can be C<0-9> or C<a-f>), conforming to S<OSF DCE 1.1>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:235
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:237
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:239
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:219
+#: ../v2v/virt-v2v.pod:241
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:221
+#: ../v2v/virt-v2v.pod:243
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:223
+#: ../v2v/virt-v2v.pod:245
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:225
+#: ../v2v/virt-v2v.pod:247
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:249
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 "
@@ -86925,14 +86988,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:235
+#: ../v2v/virt-v2v.pod:257
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:238
+#: ../v2v/virt-v2v.pod:260
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 "
@@ -86941,7 +87004,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:265
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 "
@@ -86949,7 +87012,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -86958,7 +87021,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:252
+#: ../v2v/virt-v2v.pod:274
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 "
@@ -86968,25 +87031,32 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:270
-msgid "B<--vmtype> server|desktop"
+#: ../v2v/virt-v2v.pod:292
+msgid "B<--vmtype desktop>"
msgstr ""
+#. type: =item
+#: ../v2v/virt-v2v.pod:294
+#, fuzzy
+#| msgid "B<--merge>"
+msgid "B<--vmtype server>"
+msgstr "B<--merge>"
+
#. type: textblock
-#: ../v2v/virt-v2v.pod:272
+#: ../v2v/virt-v2v.pod:296
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 "
+"C<desktop> or C<server>. If the option is not given, then a suitable "
"default is chosen based on the detected guest operating system."
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:283
+#: ../v2v/virt-v2v.pod:307
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:309
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 "
@@ -86995,7 +87065,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:290
+#: ../v2v/virt-v2v.pod:314
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87003,7 +87073,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:294
+#: ../v2v/virt-v2v.pod:318
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87011,7 +87081,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:296
+#: ../v2v/virt-v2v.pod:320
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87024,7 +87094,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:303
+#: ../v2v/virt-v2v.pod:327
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87033,7 +87103,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:306
+#: ../v2v/virt-v2v.pod:330
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87045,7 +87115,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:336
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87054,7 +87124,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:315
+#: ../v2v/virt-v2v.pod:339
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87062,19 +87132,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:317
+#: ../v2v/virt-v2v.pod:341
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:319
+#: ../v2v/virt-v2v.pod:343
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:322
+#: ../v2v/virt-v2v.pod:346
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 "
@@ -87082,7 +87152,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:327
+#: ../v2v/virt-v2v.pod:351
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 "
@@ -87090,7 +87160,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:332
+#: ../v2v/virt-v2v.pod:356
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -87098,7 +87168,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:334
+#: ../v2v/virt-v2v.pod:358
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -87106,7 +87176,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:360
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -87116,7 +87186,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:364
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87124,7 +87194,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:366
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87132,7 +87202,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:344
+#: ../v2v/virt-v2v.pod:368
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87140,7 +87210,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:346
+#: ../v2v/virt-v2v.pod:370
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87148,7 +87218,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:372
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87156,7 +87226,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:350
+#: ../v2v/virt-v2v.pod:374
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87164,7 +87234,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:376
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87173,7 +87243,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:357
+#: ../v2v/virt-v2v.pod:381
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 "
@@ -87181,14 +87251,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:363
+#: ../v2v/virt-v2v.pod:387
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:366
+#: ../v2v/virt-v2v.pod:390
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -87198,7 +87268,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:395
+#: ../v2v/virt-v2v.pod:419
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 "
@@ -87206,59 +87276,59 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:401
+#: ../v2v/virt-v2v.pod:425
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: =head1
-#: ../v2v/virt-v2v.pod:404
+#: ../v2v/virt-v2v.pod:428
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:430
msgid ""
"The I<-o libvirt> option lets you upload the converted guest to a libvirt-"
"managed host. There are several limitations:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:413
+#: ../v2v/virt-v2v.pod:437
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:418
+#: ../v2v/virt-v2v.pod:442
msgid ""
"The I<-os pool> option must specify a directory pool, not anything more "
"exotic such as iSCSI [but see below]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:423
+#: ../v2v/virt-v2v.pod:447
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:427
+#: ../v2v/virt-v2v.pod:451
msgid ""
"B<To output to a remote libvirt instance and/or a non-directory storage "
"pool> you have to use the following workaround:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:434
+#: ../v2v/virt-v2v.pod:458
msgid ""
"Use virt-v2v in I<-o local> mode to convert the guest disks and metadata "
"into a local temporary directory:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:437
+#: ../v2v/virt-v2v.pod:461
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /tmp\n"
@@ -87266,14 +87336,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:439
+#: ../v2v/virt-v2v.pod:463
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</tmp> called:"
msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
#. type: verbatim
-#: ../v2v/virt-v2v.pod:441
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" /tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -87282,17 +87352,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:468
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:448
+#: ../v2v/virt-v2v.pod:472
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:450
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" size=$(stat -c%s /tmp/NAME-sda)\n"
@@ -87302,14 +87372,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:456
+#: ../v2v/virt-v2v.pod:480
msgid ""
"Edit C</tmp/NAME.xml> to change C</tmp/NAME-sda> to the pool name. In other "
"words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:459
+#: ../v2v/virt-v2v.pod:483
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -87321,25 +87391,32 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:465
-msgid "and change I<only> the E<lt>sourceE<gt> element to:"
+#: ../v2v/virt-v2v.pod:489
+msgid ""
+"and change two things: The C<type='file'> attribute must be changed to "
+"C<type='volume'>, and the C<E<lt>sourceE<gt>> element must be changed to "
+"include C<pool> and C<volume> attributes:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:493
#, no-wrap
msgid ""
+" <disk type='volume' device='disk'>\n"
+" ...\n"
" <source pool='POOL' volume='NAME-sda' />\n"
+" ...\n"
+" </disk>\n"
"\n"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:471
+#: ../v2v/virt-v2v.pod:501
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:503
#, no-wrap
msgid ""
" virsh define /tmp/NAME.xml\n"
@@ -87347,29 +87424,29 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:481
+#: ../v2v/virt-v2v.pod:511
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:483 ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:513 ../v2v/virt-v2v.pod:567
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:485
+#: ../v2v/virt-v2v.pod:515
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:495
+#: ../v2v/virt-v2v.pod:525
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:506
+#: ../v2v/virt-v2v.pod:536
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 "
@@ -87379,31 +87456,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:546
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:528
+#: ../v2v/virt-v2v.pod:558
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:530
+#: ../v2v/virt-v2v.pod:560
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:535
+#: ../v2v/virt-v2v.pod:565
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:539
+#: ../v2v/virt-v2v.pod:569
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. "
@@ -87413,20 +87490,29 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:575
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:556
+#: ../v2v/virt-v2v.pod:586
+#, fuzzy
+#| msgid ""
+#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
+#| "list-filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
+#| "libguestfs.org/>."
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/>."
+"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
+"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
+"L<qemu-img(1)>, L<http://libguestfs.org/>."
msgstr ""
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-list-"
+"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
+"libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:603
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index c4bb72b..2dab059 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7202,72 +7243,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/es.po b/po/es.po
index f07cc5b..305633e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -233,6 +233,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -272,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,36 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -750,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -762,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -786,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -810,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -853,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -905,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -982,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -993,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1001,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1089,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1147,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1159,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1169,7 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1189,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1197,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1212,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1221,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1286,11 +1296,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1306,7 +1316,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1314,7 +1324,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1345,7 +1355,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1542,7 +1552,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1646,7 +1656,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1676,7 +1686,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1688,15 +1698,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1744,7 +1754,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1846,6 +1856,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1904,6 +1920,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1927,7 +1950,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2041,6 +2064,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2051,11 +2078,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2074,7 +2101,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2106,13 +2133,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2131,7 +2162,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2149,11 +2180,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2214,7 +2249,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2238,7 +2273,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2250,7 +2285,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2285,7 +2320,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2349,7 +2384,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2361,7 +2396,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2448,7 +2483,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2466,27 +2501,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2685,11 +2726,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7325,72 +7366,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "el parámetro %s está vacío o contiene caracteres no permitidos"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 7b01f3f..5ad7c88 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -232,6 +232,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -271,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -652,36 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -749,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -761,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -785,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -809,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -852,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -904,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -981,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -992,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1000,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1088,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1146,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1158,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1168,7 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1188,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1196,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1211,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1220,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1285,11 +1295,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1305,7 +1315,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1313,7 +1323,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1344,7 +1354,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1541,7 +1551,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1645,7 +1655,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1675,7 +1685,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1687,15 +1697,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1743,7 +1753,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1845,6 +1855,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1903,6 +1919,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1926,7 +1949,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2040,6 +2063,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2050,11 +2077,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2073,7 +2100,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2105,13 +2132,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2130,7 +2161,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2148,11 +2179,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2213,7 +2248,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2237,7 +2272,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2249,7 +2284,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2284,7 +2319,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2348,7 +2383,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2360,7 +2395,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2447,7 +2482,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2465,27 +2500,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2684,11 +2725,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7179,72 +7220,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 3ea526c..d9616cb 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -232,6 +232,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -271,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -652,36 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -749,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -761,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -785,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -809,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -852,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -904,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -981,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -992,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1000,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1088,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1146,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1158,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1168,7 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1188,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1196,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1211,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1220,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1285,11 +1295,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1305,7 +1315,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1313,7 +1323,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1344,7 +1354,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1541,7 +1551,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1645,7 +1655,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1675,7 +1685,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1687,15 +1697,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1743,7 +1753,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1845,6 +1855,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1903,6 +1919,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1926,7 +1949,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2040,6 +2063,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2050,11 +2077,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2073,7 +2100,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2105,13 +2132,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2130,7 +2161,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2148,11 +2179,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2213,7 +2248,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2237,7 +2272,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2249,7 +2284,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2284,7 +2319,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2348,7 +2383,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2360,7 +2395,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2447,7 +2482,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2465,27 +2500,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2684,11 +2725,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7177,72 +7218,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 1c695e1..b3aa3d4 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7181,72 +7222,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 0bbbe8d..2741bad 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.27\n"
+"Project-Id-Version: libguestfs 1.27.28\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -230,6 +230,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -269,7 +271,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -279,13 +281,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -306,7 +308,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -316,7 +318,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -343,14 +345,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -358,7 +360,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -376,7 +378,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -625,7 +627,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -650,36 +652,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -747,7 +753,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -759,11 +765,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -783,7 +789,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -807,11 +813,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -850,7 +856,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -902,7 +908,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -979,7 +985,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -990,7 +996,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -998,7 +1004,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1086,7 +1092,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1144,7 +1150,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1156,7 +1162,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1166,7 +1172,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1186,7 +1196,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1194,7 +1204,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1209,7 +1219,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1218,7 +1228,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1283,11 +1293,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1303,7 +1313,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1311,7 +1321,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1342,7 +1352,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1539,7 +1549,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1643,7 +1653,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1673,7 +1683,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1685,15 +1695,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1741,7 +1751,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1843,6 +1853,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1901,6 +1917,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1924,7 +1947,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2038,6 +2061,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2048,11 +2075,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2071,7 +2098,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2103,13 +2130,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2128,7 +2159,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2146,11 +2177,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2211,7 +2246,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2235,7 +2270,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2247,7 +2282,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2282,7 +2317,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2346,7 +2381,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2358,7 +2393,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2445,7 +2480,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2463,27 +2498,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2682,11 +2723,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7167,72 +7208,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index ccd5a02..e135ab2 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7179,72 +7220,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index cdc0905..8c32d6c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -232,6 +232,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -271,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -652,36 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -749,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -761,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -785,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -809,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -852,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -904,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -981,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -992,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1000,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1088,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1146,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1158,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1168,7 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1188,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1196,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1211,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1220,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1285,11 +1295,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1305,7 +1315,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1313,7 +1323,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1344,7 +1354,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1541,7 +1551,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1645,7 +1655,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1675,7 +1685,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1687,15 +1697,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1743,7 +1753,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1845,6 +1855,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1903,6 +1919,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1926,7 +1949,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2040,6 +2063,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2050,11 +2077,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2073,7 +2100,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2105,13 +2132,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2130,7 +2161,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2148,11 +2179,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2213,7 +2248,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2237,7 +2272,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2249,7 +2284,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2284,7 +2319,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2348,7 +2383,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2360,7 +2395,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2447,7 +2482,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2465,27 +2500,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2684,11 +2725,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7246,72 +7287,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "%s घटक रिकामे आहे किंवा अस्वीकार्य अक्षरे समाविष्टीत आहे"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2b33daa..79909ab 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -233,6 +233,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -272,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,36 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -750,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -762,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -786,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -810,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -853,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -905,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -982,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -993,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1001,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1089,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1147,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1159,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1169,7 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1189,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1197,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1212,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1221,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1286,11 +1296,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1306,7 +1316,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1314,7 +1324,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1345,7 +1355,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1542,7 +1552,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1646,7 +1656,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1676,7 +1686,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1688,15 +1698,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1744,7 +1754,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1846,6 +1856,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1904,6 +1920,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1927,7 +1950,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2041,6 +2064,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2051,11 +2078,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2074,7 +2101,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2106,13 +2133,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2131,7 +2162,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2149,11 +2180,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2214,7 +2249,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2238,7 +2273,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2250,7 +2285,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2285,7 +2320,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2349,7 +2384,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2361,7 +2396,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2448,7 +2483,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2466,27 +2501,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2685,11 +2726,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7375,72 +7416,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr "voor apparaat '/dev/null' moet het formaat 'raw' zijn"
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "%s parameter is leeg of bevat niet geoorloofde karakters"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr "label parameter is leeg, te lang of bevat niet toegestane karakters"
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr "'label' is vereist bij het hotpluggen van stations"
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr "schijf met label '%s' werd niet gevonden"
diff --git a/po/or.po b/po/or.po
index ec77213..aae7427 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7177,72 +7218,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index b4f3be9..a375a5c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -232,6 +232,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -271,7 +273,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -281,13 +283,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -308,7 +310,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -318,7 +320,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -345,14 +347,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -360,7 +362,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -378,7 +380,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -627,7 +629,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -652,36 +654,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -749,7 +755,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -761,11 +767,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -785,7 +791,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -809,11 +815,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -852,7 +858,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -904,7 +910,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -981,7 +987,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -992,7 +998,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1000,7 +1006,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1088,7 +1094,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1146,7 +1152,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1158,7 +1164,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1168,7 +1174,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1188,7 +1198,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1196,7 +1206,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1211,7 +1221,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1220,7 +1230,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1285,11 +1295,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1305,7 +1315,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1313,7 +1323,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1344,7 +1354,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1541,7 +1551,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1645,7 +1655,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1675,7 +1685,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1687,15 +1697,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1743,7 +1753,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1845,6 +1855,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1903,6 +1919,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1926,7 +1949,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2040,6 +2063,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2050,11 +2077,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2073,7 +2100,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2105,13 +2132,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2130,7 +2161,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2148,11 +2179,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2213,7 +2248,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2237,7 +2272,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2249,7 +2284,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2284,7 +2319,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2348,7 +2383,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2360,7 +2395,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2447,7 +2482,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2465,27 +2500,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2684,11 +2725,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7243,72 +7284,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "%s ਪੈਰਾਮੀਟਰ ਖਾਲੀ ਹੈ ਜਾਂ ਇਸ ਵਿੱਚ ਨਾ-ਮਨਜੂਰ ਅੱਖਰ ਹਨ"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 9dedabd..0ff15e6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -235,6 +235,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -274,7 +276,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -284,13 +286,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -311,7 +313,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -321,7 +323,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -348,14 +350,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -363,7 +365,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -381,7 +383,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -630,7 +632,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -655,36 +657,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -752,7 +758,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -764,11 +770,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -788,7 +794,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -812,11 +818,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -855,7 +861,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -907,7 +913,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -984,7 +990,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -995,7 +1001,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1003,7 +1009,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1091,7 +1097,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1149,7 +1155,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1161,7 +1167,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1171,7 +1177,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1191,7 +1201,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1199,7 +1209,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1214,7 +1224,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1223,7 +1233,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1288,11 +1298,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1308,7 +1318,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1316,7 +1326,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1347,7 +1357,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1544,7 +1554,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1648,7 +1658,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1678,7 +1688,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1690,15 +1700,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1746,7 +1756,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1848,6 +1858,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1906,6 +1922,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1929,7 +1952,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2043,6 +2066,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2053,11 +2080,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2076,7 +2103,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2108,13 +2135,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2133,7 +2164,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2151,11 +2182,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2216,7 +2251,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2240,7 +2275,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2252,7 +2287,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2287,7 +2322,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2351,7 +2386,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2363,7 +2398,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2450,7 +2485,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2468,27 +2503,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2687,11 +2728,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7397,72 +7438,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "parametr %s jest pusty lub zawiera niedozwolone znaki"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index c5e41b5..8fc67a2 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7178,72 +7219,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 669756c..75ec18a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -231,6 +231,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -270,7 +272,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -280,13 +282,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -307,7 +309,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -317,7 +319,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -344,14 +346,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -359,7 +361,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -377,7 +379,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -626,7 +628,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -651,36 +653,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -748,7 +754,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -760,11 +766,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -784,7 +790,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -808,11 +814,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -851,7 +857,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -903,7 +909,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -980,7 +986,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -991,7 +997,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1087,7 +1093,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1145,7 +1151,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1157,7 +1163,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1167,7 +1173,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1187,7 +1197,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1195,7 +1205,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1210,7 +1220,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1219,7 +1229,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1284,11 +1294,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1304,7 +1314,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1312,7 +1322,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1343,7 +1353,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1540,7 +1550,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1644,7 +1654,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1674,7 +1684,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1686,15 +1696,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1742,7 +1752,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1844,6 +1854,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1902,6 +1918,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1925,7 +1948,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2039,6 +2062,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2049,11 +2076,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2072,7 +2099,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2104,13 +2131,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2129,7 +2160,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2147,11 +2178,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2212,7 +2247,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2236,7 +2271,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2248,7 +2283,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2283,7 +2318,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2347,7 +2382,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2359,7 +2394,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2446,7 +2481,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2464,27 +2499,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2683,11 +2724,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7175,72 +7216,72 @@ msgstr ""
msgid "for device '/dev/null', format must be 'raw'"
msgstr ""
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr ""
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr ""
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr ""
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr ""
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr ""
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr ""
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr ""
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr ""
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr ""
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr ""
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 0f35db7..922e4f1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-15 16:36+0100\n"
+"POT-Creation-Date: 2014-08-19 17:51+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:1091
+#: ../v2v/convert_linux.ml:1134
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:145
+#: ../v2v/v2v.ml:147
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:122
+#: ../v2v/cmdline.ml:126
msgid ""
"%s: convert a guest to use KVM\n"
"\n"
@@ -233,6 +233,8 @@ msgid ""
"\n"
" virt-v2v -i libvirtxml -o local -os /tmp guest-domain.xml\n"
"\n"
+" virt-v2v -i disk -o local -os /tmp disk.img\n"
+"\n"
"There is a companion front-end called \"virt-p2v\" which comes as an\n"
"ISO or CD image that can be booted on physical machines.\n"
"\n"
@@ -272,7 +274,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:367 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:369 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -282,13 +284,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:360 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:362 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
msgid "%s: error: %s: %s\n"
msgstr ""
#. ../resize/resize.ml:1312
#. ../builder/builder.ml:746
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:365 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -309,7 +311,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:387 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -319,7 +321,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:375 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -346,14 +348,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:382 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:384 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
msgid "%s: internal error: Not_found exception was thrown\n"
msgstr ""
#. ../resize/resize.ml:1325
#. ../customize/customize_main.ml:255
#. ../builder/builder.ml:758
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -361,7 +363,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:378 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -379,7 +381,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:372 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -628,7 +630,7 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
-#: ../v2v/cmdline.ml:209
+#: ../v2v/cmdline.ml:226
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
@@ -653,36 +655,40 @@ msgstr ""
msgid "--tmp prebuilt:file: %s: file format is not qcow2"
msgstr ""
-#: ../v2v/cmdline.ml:219 ../v2v/cmdline.ml:207
+#: ../v2v/cmdline.ml:236 ../v2v/cmdline.ml:224
msgid "--vmtype option can only be used with '-o rhev'"
msgstr ""
-#: ../v2v/target_libvirt.ml:135
+#: ../v2v/source_disk.ml:34
+msgid "-i disk: invalid input filename (%s)"
+msgstr ""
+
+#: ../v2v/target_libvirt.ml:219
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/target_libvirt.ml:132
+#: ../v2v/target_libvirt.ml:216
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/cmdline.ml:214
+#: ../v2v/cmdline.ml:231
msgid "-o local: output directory was not specified, use '-os /dir'"
msgstr ""
-#: ../v2v/cmdline.ml:224
+#: ../v2v/cmdline.ml:241
msgid "-o rhev: output storage was not specified, use '-os'"
msgstr ""
-#: ../v2v/cmdline.ml:216
+#: ../v2v/cmdline.ml:233
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/source_libvirt.ml:149
+#: ../v2v/source_libvirt.ml:174
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -750,7 +756,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:149
+#: ../v2v/v2v.ml:151
msgid "Closing the overlay"
msgstr ""
@@ -762,11 +768,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:110
+#: ../v2v/v2v.ml:112
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:108
+#: ../v2v/v2v.ml:110
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -786,7 +792,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:168
+#: ../v2v/v2v.ml:170
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -810,11 +816,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:57
+#: ../v2v/v2v.ml:59
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:194
+#: ../v2v/v2v.ml:196
msgid "Creating output metadata"
msgstr ""
@@ -853,7 +859,7 @@ msgstr ""
msgid "DIR"
msgstr ""
-#: ../v2v/cmdline.ml:90 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
+#: ../v2v/cmdline.ml:92 ../sparsify/cmdline.ml:73 ../resize/resize.ml:186
msgid "Debug GC and memory allocations"
msgstr ""
@@ -905,7 +911,7 @@ msgstr ""
#. ../customize/customize_main.ml:99
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:113 ../sysprep/main.ml:155 ../sysprep/main.ml:154
+#: ../v2v/cmdline.ml:117 ../sysprep/main.ml:155 ../sysprep/main.ml:154
msgid "Display version and exit"
msgstr ""
@@ -982,7 +988,7 @@ msgstr ""
#. ../customize/customize_main.ml:97
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:111 ../sysprep/main.ml:153 ../sysprep/main.ml:152
+#: ../v2v/cmdline.ml:115 ../sysprep/main.ml:153 ../sysprep/main.ml:152
msgid "Enable debugging messages"
msgstr ""
@@ -993,7 +999,7 @@ msgstr ""
#. ../resize/resize.ml:214
#. ../customize/customize_main.ml:101
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:116 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:120 ../sysprep/main.ml:156 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
@@ -1001,7 +1007,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:291
+#: ../v2v/v2v.ml:293
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1089,7 +1095,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:210 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:212 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1147,7 +1153,7 @@ msgstr ""
msgid "HOSTNAME"
msgstr ""
-#: ../v2v/cmdline.ml:110
+#: ../v2v/cmdline.ml:114
msgid "How to choose root filesystem"
msgstr ""
@@ -1159,7 +1165,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:95
+#: ../v2v/v2v.ml:97
msgid "Initializing the target %s"
msgstr ""
@@ -1169,7 +1175,11 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:101
+#: ../v2v/cmdline.ml:96
+msgid "Input format (for -i disk)"
+msgstr ""
+
+#: ../v2v/v2v.ml:103
msgid "Inspecting the overlay"
msgstr ""
@@ -1189,7 +1199,7 @@ msgstr ""
msgid "Installing packages: %s"
msgstr ""
-#: ../v2v/cmdline.ml:95
+#: ../v2v/cmdline.ml:99
msgid "Just write the metadata"
msgstr ""
@@ -1197,7 +1207,7 @@ msgstr ""
msgid "Key: %s\n"
msgstr ""
-#: ../v2v/cmdline.ml:98 ../v2v/cmdline.ml:92
+#: ../v2v/cmdline.ml:102 ../v2v/cmdline.ml:94
msgid "Libvirt URI"
msgstr ""
@@ -1212,7 +1222,7 @@ msgstr ""
#. ../resize/resize.ml:193
#. ../customize/customize_main.ml:89
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:93 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:97 ../sysprep/main.ml:146 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
@@ -1221,7 +1231,7 @@ msgid "List supported operations"
msgstr ""
#. ../builder/cmdline.ml:140
-#: ../v2v/cmdline.ml:94 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
+#: ../v2v/cmdline.ml:98 ../sparsify/cmdline.ml:79 ../resize/resize.ml:198
msgid "Make output machine readable"
msgstr ""
@@ -1286,11 +1296,11 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:78
+#: ../v2v/v2v.ml:80
msgid "Opening the overlay"
msgstr ""
-#: ../v2v/cmdline.ml:109
+#: ../v2v/cmdline.ml:113
msgid "Output VM UUID"
msgstr ""
@@ -1306,7 +1316,7 @@ msgstr ""
msgid "Output format (default: raw)"
msgstr ""
-#: ../v2v/cmdline.ml:105
+#: ../v2v/cmdline.ml:109
msgid "Output image UUID"
msgstr ""
@@ -1314,7 +1324,7 @@ msgstr ""
msgid "Output size"
msgstr ""
-#: ../v2v/cmdline.ml:107
+#: ../v2v/cmdline.ml:111
msgid "Output vol UUID(s)"
msgstr ""
@@ -1345,7 +1355,7 @@ msgstr ""
msgid "Print info about template cache"
msgstr ""
-#: ../v2v/cmdline.ml:102 ../sparsify/cmdline.ml:81
+#: ../v2v/cmdline.ml:106 ../sparsify/cmdline.ml:81
msgid "Quiet output"
msgstr ""
@@ -1542,7 +1552,7 @@ msgstr ""
msgid "Remove user at-jobs and cron-jobs"
msgstr ""
-#: ../v2v/cmdline.ml:100
+#: ../v2v/cmdline.ml:104
msgid "Rename guest when converting"
msgstr ""
@@ -1646,7 +1656,7 @@ msgstr ""
msgid "Set format (default: auto)"
msgstr ""
-#: ../v2v/cmdline.ml:91
+#: ../v2v/cmdline.ml:93
msgid "Set input mode (default: libvirt)"
msgstr ""
@@ -1676,7 +1686,7 @@ msgstr ""
msgid "Set number of vCPUs"
msgstr ""
-#: ../v2v/cmdline.ml:97
+#: ../v2v/cmdline.ml:101
msgid "Set output allocation mode"
msgstr ""
@@ -1688,15 +1698,15 @@ msgstr ""
msgid "Set output filename"
msgstr ""
-#: ../v2v/cmdline.ml:99
+#: ../v2v/cmdline.ml:103
msgid "Set output format"
msgstr ""
-#: ../v2v/cmdline.ml:96
+#: ../v2v/cmdline.ml:100
msgid "Set output mode (default: libvirt)"
msgstr ""
-#: ../v2v/cmdline.ml:101
+#: ../v2v/cmdline.ml:105
msgid "Set output storage location"
msgstr ""
@@ -1744,7 +1754,7 @@ msgstr ""
msgid "Set user password"
msgstr ""
-#: ../v2v/cmdline.ml:115
+#: ../v2v/cmdline.ml:119
msgid "Set vmtype (for RHEV)"
msgstr ""
@@ -1846,6 +1856,12 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
+#: ../v2v/convert_linux.ml:1042
+msgid ""
+"The display driver was updated to '%s', but X11 does not seem to be "
+"installed in the guest. X may not function correctly."
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:54
msgid ""
"The fs-uuids operation is disabled by default because it does\n"
@@ -1904,6 +1920,13 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
+#: ../v2v/target_RHEV.ml:378
+msgid ""
+"This guest required a password for connection to its display, but this is "
+"not supported by RHEV. Therefore the converted guest's display will not "
+"require a separate password to connect."
+msgstr ""
+
#: ../sysprep/sysprep_operation_firewall_rules.ml:45
msgid ""
"This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
@@ -1927,7 +1950,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:140
+#: ../v2v/v2v.ml:142
msgid "Trimming filesystems to reduce amount of data to copy"
msgstr ""
@@ -2041,6 +2064,10 @@ msgstr ""
msgid "cannot detect input disk format; use the --format parameter"
msgstr ""
+#: ../v2v/source_disk.ml:50
+msgid "cannot detect the input disk format; use the -if parameter"
+msgstr ""
+
#: ../sysprep/sysprep_operation_fs_uuids.ml:42
msgid "cannot set random UUID on filesystem %s type %s: %s"
msgstr ""
@@ -2051,11 +2078,11 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:296
msgid "connection closed"
msgstr ""
-#: ../v2v/target_libvirt.ml:173
+#: ../v2v/target_libvirt.ml:257
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2074,7 +2101,7 @@ msgid ""
"Domain? The original error is: %s"
msgstr ""
-#: ../v2v/target_libvirt.ml:155
+#: ../v2v/target_libvirt.ml:239
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -2106,13 +2133,17 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:232
+#: ../v2v/v2v.ml:234
msgid ""
"disk %s (%s) has no defined format, you have to either define the original "
"format in the source metadata, or use the '-of' option to force the output "
"format"
msgstr ""
+#: ../v2v/source_libvirt.ml:106
+msgid "display <graphics type='%s'> was ignored"
+msgstr ""
+
#. ../customize/customize_main.ml:84
#. ../customize/customize_main.ml:83
#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
@@ -2131,7 +2162,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:278
+#: ../v2v/v2v.ml:280
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2149,11 +2180,15 @@ msgstr ""
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
-#: ../v2v/cmdline.ml:197
+#: ../v2v/cmdline.ml:194
+msgid "expecting a disk image (filename) on the command line"
+msgstr ""
+
+#: ../v2v/cmdline.ml:214
msgid "expecting a libvirt XML file name on the command line"
msgstr ""
-#: ../v2v/cmdline.ml:189
+#: ../v2v/cmdline.ml:205
msgid "expecting a libvirt guest name on the command line"
msgstr ""
@@ -2214,7 +2249,7 @@ msgstr ""
msgid "hostname could not be set for this type of guest"
msgstr ""
-#: ../v2v/v2v.ml:316
+#: ../v2v/v2v.ml:318
msgid ""
"libguestfs thinks this is not an installed operating system (it might be, "
"for example, an installer disk or live CD). If this is wrong, it is "
@@ -2238,7 +2273,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:301
+#: ../v2v/v2v.ml:303
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2250,7 +2285,7 @@ msgid ""
"be a bug in virt-v2v."
msgstr ""
-#: ../v2v/source_libvirt.ml:145
+#: ../v2v/source_libvirt.ml:170
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2285,7 +2320,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:271
+#: ../v2v/v2v.ml:273
msgid "no root device found in this operating system image."
msgstr ""
@@ -2349,7 +2384,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:189 ../v2v/v2v.ml:73
+#: ../v2v/v2v.ml:191 ../v2v/v2v.ml:75
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2361,7 +2396,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:309
+#: ../v2v/v2v.ml:311
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2448,7 +2483,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/source_libvirt.ml:102
+#: ../v2v/source_libvirt.ml:127
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2466,27 +2501,33 @@ msgstr ""
msgid "unknown --align-first option: use never|always|auto"
msgstr ""
-#: ../v2v/cmdline.ml:82
+#: ../v2v/cmdline.ml:84
msgid "unknown --root option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:167
+#: ../v2v/cmdline.ml:174
msgid "unknown --vmtype option, must be \"server\" or \"desktop\""
msgstr ""
-#: ../v2v/cmdline.ml:55
+#: ../v2v/cmdline.ml:57
msgid "unknown -i option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:64
+#: ../v2v/cmdline.ml:66
msgid "unknown -o option: %s"
msgstr ""
-#: ../v2v/cmdline.ml:72
+#: ../v2v/cmdline.ml:74
msgid "unknown -oa option: %s"
msgstr ""
-#: ../v2v/target_RHEV.ml:489
+#: ../v2v/target_RHEV.ml:638
+msgid ""
+"unknown NIC model %s for ethernet device %s. This NIC will be imported as "
+"rtl8139 instead."
+msgstr ""
+
+#: ../v2v/target_RHEV.ml:494
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
@@ -2685,11 +2726,11 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:130
+#: ../v2v/v2v.ml:132
msgid "virt-v2v is unable to convert this guest type (linux/distro=%s)"
msgstr ""
-#: ../v2v/v2v.ml:136
+#: ../v2v/v2v.ml:138
msgid "virt-v2v is unable to convert this guest type (type=%s)"
msgstr ""
@@ -7721,77 +7762,77 @@ msgstr "iscsi: рядок призначення не повинен почин
msgid "for device '/dev/null', format must be 'raw'"
msgstr "для пристрою /dev/null слід вказувати формат raw"
-#: src/drives.c:690
+#: src/drives.c:695
msgid "missing Unix domain socket path"
msgstr "не вказано шляху до сокета домену Unix"
-#: src/drives.c:702
+#: src/drives.c:707
#, c-format
msgid "invalid port number '%s'"
msgstr "некоректний номер порту, «%s»"
-#: src/drives.c:709
+#: src/drives.c:714
#, c-format
msgid "invalid hostname '%s'"
msgstr "некоректна назва вузла, «%s»"
-#: src/drives.c:720
+#: src/drives.c:725
#, c-format
msgid "invalid hostname or server string '%s'"
msgstr "некоректний рядок назви вузла або сервера, «%s»"
-#: src/drives.c:802
+#: src/drives.c:809
msgid "discard parameter must be 'disable', 'enable' or 'besteffort'"
msgstr ""
"значенням параметра discard має бути «disable», «enable» або «besteffort»"
-#: src/drives.c:811
+#: src/drives.c:818
msgid "discard support cannot be enabled on read-only drives"
msgstr ""
"підтримку discard не можна вмикати для дисків, призначених лише для читання"
-#: src/drives.c:817 src/drives.c:823
+#: src/drives.c:824 src/drives.c:830
#, c-format
msgid "%s parameter is empty or contains disallowed characters"
msgstr "параметр %s є порожнім або містить заборонені до використання символи"
-#: src/drives.c:829
+#: src/drives.c:836
msgid "label parameter is empty, too long, or contains disallowed characters"
msgstr ""
"параметр мітки є порожнім, занадто довгим або містить заборонені символи"
-#: src/drives.c:835
+#: src/drives.c:842
msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
msgstr "параметром режиму кешування має бути «writeback» (типово) або «unsafe»"
-#: src/drives.c:842
+#: src/drives.c:849
msgid "you cannot specify a server with file-backed disks"
msgstr "не можна вказувати сервер з резервними копіями дисків у файлах"
-#: src/drives.c:847
+#: src/drives.c:854
msgid "you cannot specify a username with file-backed disks"
msgstr ""
"не можна вказувати ім’я користувача для резервних копій дисків у файлах"
-#: src/drives.c:851
+#: src/drives.c:858
msgid "you cannot specify a secret with file-backed disks"
msgstr "не можна вказувати пароль з резервними копіями дисків у файлах"
-#: src/drives.c:914
+#: src/drives.c:921
#, c-format
msgid "unknown protocol '%s'"
msgstr "невідомий протокол «%s»"
-#: src/drives.c:932 src/drives.c:1080
+#: src/drives.c:939 src/drives.c:1087
msgid "the current backend does not support hotplugging drives"
msgstr ""
"у поточному модулі не передбачено підтримки інтерактивного з’єднання дисків"
-#: src/drives.c:938
+#: src/drives.c:945
msgid "'label' is required when hotplugging drives"
msgstr "для інтерактивного з’єднання дисків слід вказати «label»"
-#: src/drives.c:1065
+#: src/drives.c:1072
#, c-format
msgid "disk with label '%s' not found"
msgstr "диска з міткою «%s» не знайдено"
--
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