[Pkg-libvirt-commits] [libguestfs] 253/266: Version 1.27.35.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:42:53 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 3c1b81d2af5c61863ac59e28f2a8509ed7a3e7ce
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Sep 1 17:40:56 2014 +0100
Version 1.27.35.
---
BUGS | 12 +-
configure.ac | 2 +-
po-docs/ja.po | 656 +++++++++++++++++++++++++-------------------
po-docs/libguestfs-docs.pot | 599 ++++++++++++++++++++++------------------
po-docs/uk.po | 634 +++++++++++++++++++++++-------------------
po/en_GB.po | 121 ++++----
po/es.po | 121 ++++----
po/gu.po | 121 ++++----
po/hi.po | 121 ++++----
po/kn.po | 121 ++++----
po/libguestfs.pot | 123 +++++----
po/ml.po | 121 ++++----
po/mr.po | 121 ++++----
po/nl.po | 121 ++++----
po/or.po | 121 ++++----
po/pa.po | 121 ++++----
po/pl.po | 121 ++++----
po/ta.po | 121 ++++----
po/te.po | 121 ++++----
po/uk.po | 121 ++++----
20 files changed, 2020 insertions(+), 1700 deletions(-)
diff --git a/BUGS b/BUGS
index 49afeb1..3d2ab39 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-08-29
+Last updated: 2014-09-01
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -407,9 +407,6 @@ You can help by testing the fixes.
1021149 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1021149
Rebase libguestfs to 1.28 in RHEL 7.1
-1079182 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1079182
- virt-df cannot report used disk space of windows guest when updated to 6.5
-
1097359 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1097359
virt-sparsify hangs with 'No space left on device' while filling LV
@@ -422,7 +419,7 @@ You can help by testing the fixes.
1123794 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1123794
libguestfs 'direct' backend should close file descriptors before exec-ing qemu to avoid leaking !O_CLOEXEC fds
-(13 bugs)
+(12 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
@@ -448,6 +445,9 @@ These bugs are in the VERIFIED state.
1072062 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1072062
Ruby bindings for libguestfs throws an error periodically
+1079182 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1079182
+ virt-df cannot report used disk space of windows guest when updated to 6.5
+
1091805 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091805
tar-in-opts execute failed that cause libguestfs appliance crashed
@@ -457,6 +457,6 @@ These bugs are in the VERIFIED state.
1099332 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099332
typo errors in man pages
-(10 bugs)
+(11 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 0284758..90a7a64 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], [34])
+m4_define([libguestfs_release], [35])
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 63c243d..16b4316 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-29 22:42+0200\n"
+"POT-Creation-Date: 2014-09-01 17:39+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/"
@@ -391,11 +391,11 @@ msgstr ""
#: ../fish/virt-tar-out.pod:34 ../format/virt-format.pod:57
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
-#: ../p2v/virt-p2v.pod:178 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:203 ../rescue/virt-rescue.pod:113
#: ../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:131
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:133
msgid "OPTIONS"
msgstr "オプション"
@@ -410,11 +410,11 @@ msgstr "オプション"
#: ../fish/guestfish.pod:156 ../format/virt-format.pod:61
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
-#: ../p2v/virt-p2v.pod:182 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:207 ../rescue/virt-rescue.pod:117
#: ../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:135
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:137
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:330
+#: ../v2v/virt-v2v.pod:331
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:332
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:333
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -773,10 +773,10 @@ msgstr ""
#: ../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
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:216
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:417
+#: ../v2v/virt-v2v.pod:418
msgid "B<-v>"
msgstr "B<-v>"
@@ -788,10 +788,10 @@ msgstr "B<-v>"
#: ../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
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:218
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:419
+#: ../v2v/virt-v2v.pod:420
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:421
+#: ../v2v/virt-v2v.pod:422
msgid "Enable verbose messages for debugging."
msgstr "デバッグ用の冗長なメッセージを有効にします。"
@@ -818,10 +818,10 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../fish/guestfish.pod:426 ../format/virt-format.pod:159
#: ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:203
-#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:222 ../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:423
+#: ../v2v/virt-v2v.pod:424
msgid "B<-V>"
msgstr "B<-V>"
@@ -836,11 +836,11 @@ msgstr "B<-V>"
#: ../fish/guestfish.pod:428 ../format/virt-format.pod:161
#: ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:205
-#: ../p2v/virt-p2v.pod:199 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:224 ../rescue/virt-rescue.pod:246
#: ../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:425
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:426
msgid "B<--version>"
msgstr "B<--version>"
@@ -851,11 +851,11 @@ msgstr "B<--version>"
#: ../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
+#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:226
#: ../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:427
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:428
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:438
+#: ../v2v/virt-v2v.pod:439
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:440
+#: ../v2v/virt-v2v.pod:441
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:346 ../v2v/virt-v2v.pod:350
-#: ../v2v/virt-v2v.pod:354 ../v2v/virt-v2v.pod:640 ../v2v/virt-v2v.pod:645
-#: ../v2v/virt-v2v.pod:650
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:347 ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:355 ../v2v/virt-v2v.pod:641 ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:651
msgid "*"
msgstr "*"
@@ -1483,13 +1483,13 @@ msgstr ""
#: ../inspector/virt-inspector.pod:492 ../java/examples/guestfs-java.pod:156
#: ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215
#: ../ocaml/examples/guestfs-ocaml.pod:76 ../p2v-iso/guestfs-p2v-iso.pod:224
-#: ../p2v/virt-p2v.pod:205 ../perl/examples/guestfs-perl.pod:38
+#: ../p2v/virt-p2v.pod:230 ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:751 ../ruby/examples/guestfs-ruby.pod:34
#: ../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:875
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:876
msgid "SEE ALSO"
msgstr "関連項目"
@@ -1525,11 +1525,11 @@ msgstr "著者"
#: ../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-rescue.pod:424
+#: ../p2v/virt-p2v.pod:238 ../rescue/virt-rescue.pod:424
#: ../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:890
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:891
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1553,13 +1553,13 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:515 ../java/examples/guestfs-java.pod:175
#: ../lua/examples/guestfs-lua.pod:155 ../make-fs/virt-make-fs.pod:233
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../p2v-iso/guestfs-p2v-iso.pod:236
-#: ../p2v/virt-p2v.pod:217 ../perl/examples/guestfs-perl.pod:57
+#: ../p2v/virt-p2v.pod:242 ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:778 ../ruby/examples/guestfs-ruby.pod:52
#: ../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:896
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:897
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:812
+#: ../v2v/virt-v2v.pod:813
msgid "ENVIRONMENT VARIABLES"
msgstr "環境変数"
@@ -1922,11 +1922,11 @@ msgstr ""
#: ../fuse/guestunmount.pod:156 ../golang/examples/guestfs-golang.pod:91
#: ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
-#: ../p2v/virt-p2v.pod:211 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:236 ../perl/examples/guestfs-perl.pod:53
#: ../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:888
+#: ../v2v/virt-v2v.pod:889
msgid "AUTHORS"
msgstr "著者"
@@ -1954,9 +1954,9 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../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
+#: ../p2v/virt-p2v.pod:244 ../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:898
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:899
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -2404,8 +2404,8 @@ 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:137
+#: ../p2v/virt-p2v.pod:209 ../resize/virt-resize.pod:272
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:139
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:195
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:197
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:197
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:199
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:661 ../v2v/virt-v2v.pod:774
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:662 ../v2v/virt-v2v.pod:775
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:675 ../v2v/virt-v2v.pod:781
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:676 ../v2v/virt-v2v.pod:782
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:683
-#: ../v2v/virt-v2v.pod:787
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:684
+#: ../v2v/virt-v2v.pod:788
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:704
+#: ../v2v/virt-v2v.pod:705
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:749
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:750
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:764
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:765
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:835
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:836
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:840
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:841
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:843
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:844
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:847
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:848
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:854
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:855
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7874,7 +7874,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:572 ../guestfs-release-notes.pod:576
#: ../guestfs-release-notes.pod:921 ../guestfs-release-notes.pod:925
#: ../guestfs-release-notes.pod:1477 ../guestfs-release-notes.pod:1481
-#: ../p2v/virt-p2v.pod:168 ../p2v/virt-p2v.pod:174
+#: ../p2v/virt-p2v.pod:193 ../p2v/virt-p2v.pod:199
#: ../src/guestfs-actions.pod:1 ../src/guestfs-actions.pod:24
#: ../src/guestfs-availability.pod:1 ../src/guestfs-availability.pod:24
#: ../src/guestfs-structs.pod:1 ../src/guestfs-structs.pod:24
@@ -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:873
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:874
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:798
+#: ../v2v/virt-v2v.pod:799
msgid "FILES"
msgstr "ファイル"
@@ -51614,7 +51614,7 @@ msgid ""
" PROMPT 0\n"
" LABEL p2v\n"
" KERNEL virt-p2v-vmlinuz\n"
-" APPEND initrd=virt-p2v-initrd p2v.server=conv.example.com p2v.password=secret\n"
+" APPEND initrd=virt-p2v-initrd p2v.server=conv.example.com p2v.password=secret p2v.output=libvirt\n"
"\n"
msgstr ""
@@ -51806,48 +51806,133 @@ msgstr ""
#. type: =item
#: ../p2v/virt-p2v.pod:164
-msgid "B<ip=dhcp>"
+msgid "B<p2v.output=[libvirt|local|...]>"
msgstr ""
#. type: textblock
#: ../p2v/virt-p2v.pod:166
+#, fuzzy
+#| msgid ""
+#| "Set the last mounted directory. This is the same as the tune2fs C<-M> "
+#| "option."
+msgid ""
+"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+"最後にマウントされたディレクトリーを設定します。これは tune2fs C<-M> オプショ"
+"ンと同じです。"
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:169
+msgid ""
+"If not specified, the default is C<local>, and the converted guest is "
+"written to C</var/tmp>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:172
+msgid "B<p2v.output_allocation=sparse|preallocated>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:174
+#, fuzzy
+#| msgid ""
+#| "Set the last mounted directory. This is the same as the tune2fs C<-M> "
+#| "option."
+msgid ""
+"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
+"option. See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+"最後にマウントされたディレクトリーを設定します。これは tune2fs C<-M> オプショ"
+"ンと同じです。"
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:177
+msgid "B<p2v.output_format=raw|sparse|...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:179
+#, fuzzy
+#| msgid ""
+#| "Set the last mounted directory. This is the same as the tune2fs C<-M> "
+#| "option."
+msgid ""
+"Set the output format. This is the same as the virt-v2v I<-oa> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+"最後にマウントされたディレクトリーを設定します。これは tune2fs C<-M> オプショ"
+"ンと同じです。"
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:182
+msgid "B<p2v.output_storage=...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:184
+#, fuzzy
+#| msgid ""
+#| "Set the last mounted directory. This is the same as the tune2fs C<-M> "
+#| "option."
+msgid ""
+"Set the output storage. This is the same as the virt-v2v I<-os> option. "
+"See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+"最後にマウントされたディレクトリーを設定します。これは tune2fs C<-M> オプショ"
+"ンと同じです。"
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:187
+msgid ""
+"If not specified, the default is C</var/tmp> (on the conversion server)."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:189
+msgid "B<ip=dhcp>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:191
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:170
+#: ../p2v/virt-p2v.pod:195
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:172
+#: ../p2v/virt-p2v.pod:197
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:186
+#: ../p2v/virt-p2v.pod:211
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:188
+#: ../p2v/virt-p2v.pod:213
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:220
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:207
+#: ../p2v/virt-p2v.pod:232
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:892
+#: ../p2v/virt-p2v.pod:240 ../v2v/virt-v2v.pod:893
msgid "Matthew Booth"
msgstr ""
@@ -53433,7 +53518,7 @@ msgstr "デバッグメッセージを有効にします。"
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:143
+#: ../v2v/virt-v2v.pod:145
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -53919,7 +54004,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:755
+#: ../v2v/virt-v2v.pod:756
msgid "There are two ways to use this option."
msgstr "このオプションを使用するには 2 通りの方法があります。"
@@ -53952,7 +54037,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:767
+#: ../v2v/virt-v2v.pod:768
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -53960,13 +54045,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:770
+#: ../v2v/virt-v2v.pod:771
msgid "At the moment this means:"
msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:776
+#: ../v2v/virt-v2v.pod:777
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -53974,7 +54059,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:779
+#: ../v2v/virt-v2v.pod:780
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -53985,7 +54070,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:783
+#: ../v2v/virt-v2v.pod:784
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -54683,7 +54768,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:334
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:335
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -54866,7 +54951,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:818
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:819
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -54880,7 +54965,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:821
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:822
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 "
@@ -54888,7 +54973,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:825
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:826
msgid "This defaults to C</tmp>."
msgstr "この初期値は C</tmp> です。"
@@ -54903,7 +54988,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:833
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:834
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -87587,7 +87672,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:127
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
@@ -87595,7 +87680,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:117
#, fuzzy, no-wrap
#| msgid ""
#| " virt-rescue --ro -a /path/to/disk.img\n"
@@ -87614,7 +87699,7 @@ msgstr ""
#| " virt-rescue --ro -a /path/to/disk.img\n"
#| "\n"
msgid ""
-" virt-v2v -i disk disk.img -o glance -os glance_image_name\n"
+" virt-v2v -i disk disk.img -o glance\n"
"\n"
msgstr ""
" virt-rescue --ro -a /path/to/disk.img\n"
@@ -87797,29 +87882,36 @@ msgid ""
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
-#. type: =head2
+#. type: textblock
#: ../v2v/virt-v2v.pod:110
#, fuzzy
+#| msgid "To convert between formats, use the I<--convert> option:"
+msgid "To control the name of the image in glance, use the I<-on> option."
+msgstr "形式を変換するには I<--convert> オプションを使用します:"
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:112
+#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "空のディスクイメージを作成します"
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:114
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:119
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:122
msgid ""
"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
"formatdomain.html> describing the input guest (if you can get the source "
@@ -87828,47 +87920,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:139
+#: ../v2v/virt-v2v.pod:141
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:141
+#: ../v2v/virt-v2v.pod:143
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:147
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:149
+#: ../v2v/virt-v2v.pod:151
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i disk>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:155
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 "
@@ -87878,34 +87970,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:161
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:161
+#: ../v2v/virt-v2v.pod:163
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:165
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:166
+#: ../v2v/virt-v2v.pod:168
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:170
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:172
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 "
@@ -87914,87 +88006,87 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:177
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:177
+#: ../v2v/virt-v2v.pod:179
#, 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:179
+#: ../v2v/virt-v2v.pod:181
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:183
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:184
+#: ../v2v/virt-v2v.pod:186
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:189
#, fuzzy
#| msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:191
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:193
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:201
+#: ../v2v/virt-v2v.pod:203
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:205
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:207
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:209
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:209
+#: ../v2v/virt-v2v.pod:211
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -88002,28 +88094,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:215
#, fuzzy
#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:219
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:220
+#: ../v2v/virt-v2v.pod:222
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 "
@@ -88031,67 +88123,68 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:226
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:229
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:231
#, fuzzy
#| msgid "B<-o kernel_cache>"
msgid "B<-o glance>"
msgstr "B<-o kernel_cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
-"is uploaded to Glance as the image named in the I<-os> parameter."
+"is uploaded to Glance. You can control the image name by setting the I<-on> "
+"option."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:237
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:239
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:241
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:241
+#: ../v2v/virt-v2v.pod:244
#, 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:243
+#: ../v2v/virt-v2v.pod:246
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:248
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:250
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 "
@@ -88099,7 +88192,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:254
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -88109,38 +88202,38 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:258
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:258
+#: ../v2v/virt-v2v.pod:261
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o option>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:263
#, 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:262
+#: ../v2v/virt-v2v.pod:265
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:267
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -88149,102 +88242,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:274
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:276
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:278
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:280
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:282
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:282
+#: ../v2v/virt-v2v.pod:285
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:288
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:290
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:292
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:294
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:296
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:296
+#: ../v2v/virt-v2v.pod:299
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:301
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
-msgid "For I<-o glance>, this is the Glance image name."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:303
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:306
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:308
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:310
+#: ../v2v/virt-v2v.pod:311
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -88252,7 +88340,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:313
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. "
@@ -88260,7 +88348,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:317
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 "
@@ -88268,21 +88356,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:322
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:324
+#: ../v2v/virt-v2v.pod:325
#, fuzzy
#| msgid "B<--parts>"
msgid "B<--print-source>"
msgstr "B<--parts>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:327
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -88290,105 +88378,105 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:337
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:339
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:341
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:343
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:349
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:353
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:357
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:361
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:362
+#: ../v2v/virt-v2v.pod:363
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:365
+#: ../v2v/virt-v2v.pod:366
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:369
+#: ../v2v/virt-v2v.pod:370
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:372
+#: ../v2v/virt-v2v.pod:373
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:375
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:377
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:378
+#: ../v2v/virt-v2v.pod:379
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:381
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:382
+#: ../v2v/virt-v2v.pod:383
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:385
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:387
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 "
@@ -88399,14 +88487,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:395
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:397
+#: ../v2v/virt-v2v.pod:398
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 "
@@ -88415,7 +88503,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:402
+#: ../v2v/virt-v2v.pod:403
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 "
@@ -88423,7 +88511,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:407
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 "
@@ -88432,7 +88520,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:412
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 "
@@ -88442,19 +88530,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:430
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:432
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:434
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -88462,12 +88550,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:445
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:447
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 "
@@ -88476,7 +88564,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:452
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -88484,7 +88572,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:455
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -88492,7 +88580,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:458
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -88505,7 +88593,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:464
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -88514,7 +88602,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:468
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -88526,7 +88614,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -88535,7 +88623,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -88543,19 +88631,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:479
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:481
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:483
+#: ../v2v/virt-v2v.pod:484
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 "
@@ -88563,7 +88651,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:489
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 "
@@ -88571,7 +88659,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:494
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -88579,7 +88667,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:495
+#: ../v2v/virt-v2v.pod:496
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -88587,7 +88675,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:498
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -88597,7 +88685,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:502
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -88605,7 +88693,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:504
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -88613,7 +88701,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:505
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -88621,7 +88709,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:507
+#: ../v2v/virt-v2v.pod:508
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -88629,7 +88717,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:510
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -88637,7 +88725,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -88645,7 +88733,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:513
+#: ../v2v/virt-v2v.pod:514
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -88654,12 +88742,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -88667,7 +88755,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:524
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -88677,14 +88765,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:529
+#: ../v2v/virt-v2v.pod:530
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -88695,21 +88783,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:538
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:541
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:544
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -88717,12 +88805,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:546
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:548
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -88730,14 +88818,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:549
+#: ../v2v/virt-v2v.pod:550
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:553
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -88748,7 +88836,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:558
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -88756,23 +88844,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:559
+#: ../v2v/virt-v2v.pod:560
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:562
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:567
msgid ""
"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
"should be I<-i libvirt>. As this is the default, you don't need to specify "
@@ -88780,12 +88868,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:571
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:572
+#: ../v2v/virt-v2v.pod:573
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -88793,7 +88881,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:574
+#: ../v2v/virt-v2v.pod:575
msgid ""
"where C<user@> is the (optional, but recommended) user to connect as, "
"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -88802,25 +88890,25 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:580
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:581
+#: ../v2v/virt-v2v.pod:582
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:584
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:587
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -88829,7 +88917,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:590
#, no-wrap
msgid ""
" Id Name State\n"
@@ -88840,7 +88928,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
msgid ""
"If you get an error \"Peer certificate cannot be authenticated with given CA "
"certificates\" or similar, then you can either import the ESX host's "
@@ -88849,7 +88937,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:599
+#: ../v2v/virt-v2v.pod:600
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -88857,14 +88945,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:601
+#: ../v2v/virt-v2v.pod:602
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:605
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -88876,7 +88964,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -88884,17 +88972,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:614
+#: ../v2v/virt-v2v.pod:615
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:618
+#: ../v2v/virt-v2v.pod:619
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -88904,13 +88992,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622
+#: ../v2v/virt-v2v.pod:623
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:626
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -88918,7 +89006,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:629
+#: ../v2v/virt-v2v.pod:630
msgid ""
"In this case the output flags are set to write the converted guest to a "
"temporary directory as this is just an example, but you can also write to "
@@ -88926,52 +89014,52 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:633
+#: ../v2v/virt-v2v.pod:634
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:636
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:642
+#: ../v2v/virt-v2v.pod:643
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:647
+#: ../v2v/virt-v2v.pod:648
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:652
+#: ../v2v/virt-v2v.pod:653
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:657
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:663
+#: ../v2v/virt-v2v.pod:664
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:666
+#: ../v2v/virt-v2v.pod:667
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -88979,14 +89067,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:668
+#: ../v2v/virt-v2v.pod:669
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "これは C</tmp> と C</var/tmp> の中にある一時ファイルを削除します。"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:671
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -88995,17 +89083,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:677
+#: ../v2v/virt-v2v.pod:678
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -89015,14 +89103,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:688
+#: ../v2v/virt-v2v.pod:689
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -89034,7 +89122,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:694
+#: ../v2v/virt-v2v.pod:695
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 "
@@ -89042,7 +89130,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:698
+#: ../v2v/virt-v2v.pod:699
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -89054,12 +89142,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:707
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:708
+#: ../v2v/virt-v2v.pod:709
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -89067,19 +89155,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:713
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -89087,7 +89175,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -89120,7 +89208,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:751
+#: ../v2v/virt-v2v.pod:752
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 "
@@ -89128,14 +89216,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:758
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:760
+#: ../v2v/virt-v2v.pod:761
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -89145,7 +89233,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:789
+#: ../v2v/virt-v2v.pod:790
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 "
@@ -89153,36 +89241,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:795
+#: ../v2v/virt-v2v.pod:796
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:802
+#: ../v2v/virt-v2v.pod:803
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804 ../v2v/virt-v2v.pod:858
+#: ../v2v/virt-v2v.pod:805 ../v2v/virt-v2v.pod:859
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:806
+#: ../v2v/virt-v2v.pod:807
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:816
+#: ../v2v/virt-v2v.pod:817
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -89192,31 +89280,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:837
+#: ../v2v/virt-v2v.pod:838
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:849
+#: ../v2v/virt-v2v.pod:850
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:851
+#: ../v2v/virt-v2v.pod:852
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:856
+#: ../v2v/virt-v2v.pod:857
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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. "
@@ -89226,14 +89314,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:866
+#: ../v2v/virt-v2v.pod:867
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:877
+#: ../v2v/virt-v2v.pod:878
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-make-"
@@ -89247,6 +89335,6 @@ msgstr ""
"L<virt-rescue(1)>, L<virt-resize(1)>, L<http://libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:894
+#: ../v2v/virt-v2v.pod:895
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index e1cc289..84a4a34 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.34\n"
+"Project-Id-Version: libguestfs 1.27.35\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-08-29 22:42+0200\n"
+"POT-Creation-Date: 2014-09-01 17:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -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:330
+#: ../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:331
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:332
+#: ../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:333
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:216 ../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:218 ../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:421
+#: ../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:422
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:226 ../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:238 ../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:812
+#: ../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:813
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:244 ../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:137
+#: ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v.pod:209 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:139
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:195
+#: ../builder/virt-builder.pod:347 ../resize/virt-resize.pod:441 ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:197
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:197
+#: ../builder/virt-builder.pod:349 ../resize/virt-resize.pod:443 ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:199
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:683 ../v2v/virt-v2v.pod:787
+#: ../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:684 ../v2v/virt-v2v.pod:788
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:704
+#: ../builder/virt-builder.pod:405 ../customize/virt-customize.pod:172 ../rescue/virt-rescue.pod:352 ../resize/virt-resize.pod:59 ../v2v/virt-v2v.pod:705
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:749
+#: ../builder/virt-builder.pod:1604 ../resize/virt-resize.pod:595 ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:750
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:764
+#: ../builder/virt-builder.pod:1621 ../resize/virt-resize.pod:613 ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:765
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:835
+#: ../builder/virt-builder.pod:1645 ../customize/virt-customize.pod:220 ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:836
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:840
+#: ../builder/virt-builder.pod:1650 ../customize/virt-customize.pod:225 ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:841
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:843
+#: ../builder/virt-builder.pod:1653 ../customize/virt-customize.pod:228 ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:844
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:847
+#: ../builder/virt-builder.pod:1657 ../customize/virt-customize.pod:232 ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:848
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:854
+#: ../builder/virt-builder.pod:1663 ../customize/virt-customize.pod:238 ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:855
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -6675,7 +6675,7 @@ msgid ""
msgstr ""
#. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:24 ../examples/guestfs-recipes.pod:1 ../examples/guestfs-recipes.pod:6 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:24 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:24 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:24 ../guestfs-release-notes.pod:5 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:268 ../guestfs-release-notes.pod:272 ../guestfs-release [...]
+#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:24 ../examples/guestfs-recipes.pod:1 ../examples/guestfs-recipes.pod:6 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:24 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:24 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:24 ../guestfs-release-notes.pod:5 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:268 ../guestfs-release-notes.pod:272 ../guestfs-release [...]
msgid "comment"
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:873
+#: ../customize/virt-customize.pod:244 ../sparsify/virt-sparsify.pod:426 ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:874
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:798
+#: ../daemon/guestfsd.pod:76 ../fish/guestfish.pod:1537 ../fuse/guestmount.pod:391 ../rescue/virt-rescue.pod:393 ../v2v/virt-v2v.pod:799
msgid "FILES"
msgstr ""
@@ -47286,7 +47286,7 @@ msgid ""
" LABEL p2v\n"
" KERNEL virt-p2v-vmlinuz\n"
" APPEND initrd=virt-p2v-initrd p2v.server=conv.example.com "
-"p2v.password=secret\n"
+"p2v.password=secret p2v.output=libvirt\n"
"\n"
msgstr ""
@@ -47479,48 +47479,108 @@ msgstr ""
#. type: =item
#: ../p2v/virt-p2v.pod:164
-msgid "B<ip=dhcp>"
+msgid "B<p2v.output=[libvirt|local|...]>"
msgstr ""
#. type: textblock
#: ../p2v/virt-p2v.pod:166
+msgid ""
+"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:169
+msgid ""
+"If not specified, the default is C<local>, and the converted guest is "
+"written to C</var/tmp>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:172
+msgid "B<p2v.output_allocation=sparse|preallocated>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:174
+msgid ""
+"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
+"option. See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:177
+msgid "B<p2v.output_format=raw|sparse|...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:179
+msgid ""
+"Set the output format. This is the same as the virt-v2v I<-oa> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:182
+msgid "B<p2v.output_storage=...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:184
+msgid ""
+"Set the output storage. This is the same as the virt-v2v I<-os> option. "
+"See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:187
+msgid "If not specified, the default is C</var/tmp> (on the conversion server)."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:189
+msgid "B<ip=dhcp>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:191
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:170
+#: ../p2v/virt-p2v.pod:195
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:172
+#: ../p2v/virt-p2v.pod:197
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:186
+#: ../p2v/virt-p2v.pod:211
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:188
+#: ../p2v/virt-p2v.pod:213
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:220
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:207
+#: ../p2v/virt-p2v.pod:232
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:892
+#: ../p2v/virt-p2v.pod:240 ../v2v/virt-v2v.pod:893
msgid "Matthew Booth"
msgstr ""
@@ -48971,7 +49031,7 @@ msgid "Enable debugging messages."
msgstr ""
#. type: =item
-#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:143
+#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186 ../v2v/virt-v2v.pod:145
msgid "B<--debug-gc>"
msgstr ""
@@ -49419,7 +49479,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:755
+#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346 ../v2v/virt-v2v.pod:756
msgid "There are two ways to use this option."
msgstr ""
@@ -49444,26 +49504,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:767
+#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359 ../v2v/virt-v2v.pod:768
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:770
+#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362 ../v2v/virt-v2v.pod:771
msgid "At the moment this means:"
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:776
+#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368 ../v2v/virt-v2v.pod:777
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:779
+#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371 ../v2v/virt-v2v.pod:780
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -49471,7 +49531,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:783
+#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375 ../v2v/virt-v2v.pod:784
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -50113,7 +50173,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:334
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:335
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -50286,7 +50346,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:818
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:819
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -50300,7 +50360,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:821
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:822
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 "
@@ -50308,7 +50368,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:825
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:826
msgid "This defaults to C</tmp>."
msgstr ""
@@ -50323,7 +50383,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:833
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:834
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -78377,7 +78437,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:127
#, no-wrap
msgid ""
" virt-v2v -i libvirtxml -o local -os /var/tmp guest-domain.xml\n"
@@ -78385,7 +78445,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:117
#, no-wrap
msgid ""
" virt-v2v -i disk -o local -os /var/tmp disk.img\n"
@@ -78396,7 +78456,7 @@ msgstr ""
#: ../v2v/virt-v2v.pod:16 ../v2v/virt-v2v.pod:108
#, no-wrap
msgid ""
-" virt-v2v -i disk disk.img -o glance -os glance_image_name\n"
+" virt-v2v -i disk disk.img -o glance\n"
"\n"
msgstr ""
@@ -78571,27 +78631,32 @@ msgid ""
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
-#. type: =head2
+#. type: textblock
#: ../v2v/virt-v2v.pod:110
+msgid "To control the name of the image in glance, use the I<-on> option."
+msgstr ""
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:112
msgid "Convert disk image to disk image"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:114
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:119
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:122
msgid ""
"A more complex method is to write some L<libvirt "
"XML|http://libvirt.org/formatdomain.html> describing the input guest (if you "
@@ -78600,41 +78665,41 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:139
+#: ../v2v/virt-v2v.pod:141
msgid "B<--bridge> ..."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:141
+#: ../v2v/virt-v2v.pod:143
msgid "See I<--network> below."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:147
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:149
+#: ../v2v/virt-v2v.pod:151
msgid "B<-i disk>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:155
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 "
@@ -78644,34 +78709,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:161
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:161
+#: ../v2v/virt-v2v.pod:163
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:165
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:166
+#: ../v2v/virt-v2v.pod:168
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:170
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:172
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 "
@@ -78680,73 +78745,73 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:177
msgid "B<-i local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:177
+#: ../v2v/virt-v2v.pod:179
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:181
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:183
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:184
+#: ../v2v/virt-v2v.pod:186
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:189
msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:191
msgid "B<-if> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:193
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:201
+#: ../v2v/virt-v2v.pod:203
msgid "B<--network> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:205
msgid "B<--network> out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:207
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:209
msgid "B<--bridge> out"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:209
+#: ../v2v/virt-v2v.pod:211
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -78754,24 +78819,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:215
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:217
msgid "B<--no-copy>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:219
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:220
+#: ../v2v/virt-v2v.pod:222
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 "
@@ -78779,63 +78844,64 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:226
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:229
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:231
msgid "B<-o glance>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
-"is uploaded to Glance as the image named in the I<-os> parameter."
+"is uploaded to Glance. You can control the image name by setting the I<-on> "
+"option."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:237
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:239
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:241
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:241
+#: ../v2v/virt-v2v.pod:244
msgid "See L</OUTPUT TO LIBVIRT> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:243
+#: ../v2v/virt-v2v.pod:246
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:248
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:250
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 "
@@ -78843,7 +78909,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:254
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -78853,34 +78919,34 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:258
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:258
+#: ../v2v/virt-v2v.pod:261
msgid "B<-o ovirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:263
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:265
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:267
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -78889,102 +78955,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:274
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:276
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:278
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:280
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:282
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:282
+#: ../v2v/virt-v2v.pod:285
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:288
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:290
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:292
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:294
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:296
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:296
+#: ../v2v/virt-v2v.pod:299
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:301
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
-msgid "For I<-o glance>, this is the Glance image name."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:303
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh "
"pool-list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:306
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:308
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:310
+#: ../v2v/virt-v2v.pod:311
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -78992,7 +79053,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:313
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. "
@@ -79000,7 +79061,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:317
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 "
@@ -79008,19 +79069,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:322
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:324
+#: ../v2v/virt-v2v.pod:325
msgid "B<--print-source>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:327
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -79028,103 +79089,103 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:337
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:339
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:341
msgid "B<--rhev-vm-uuid> UUID"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:343
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:349
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:353
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:357
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:361
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:362
+#: ../v2v/virt-v2v.pod:363
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:365
+#: ../v2v/virt-v2v.pod:366
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:369
+#: ../v2v/virt-v2v.pod:370
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:372
+#: ../v2v/virt-v2v.pod:373
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:375
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:377
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:378
+#: ../v2v/virt-v2v.pod:379
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:381
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:382
+#: ../v2v/virt-v2v.pod:383
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:385
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:387
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 "
@@ -79135,14 +79196,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:395
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:397
+#: ../v2v/virt-v2v.pod:398
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 "
@@ -79151,7 +79212,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:402
+#: ../v2v/virt-v2v.pod:403
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 "
@@ -79159,7 +79220,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:407
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 "
@@ -79168,7 +79229,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:412
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 "
@@ -79178,17 +79239,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:430
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:432
msgid "B<--vmtype server>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:434
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -79196,12 +79257,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:445
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:447
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 "
@@ -79210,7 +79271,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:452
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -79218,7 +79279,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:455
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -79226,7 +79287,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:458
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -79239,7 +79300,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:464
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -79248,7 +79309,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:468
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -79260,7 +79321,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -79269,7 +79330,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -79277,19 +79338,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:479
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:481
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:483
+#: ../v2v/virt-v2v.pod:484
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 "
@@ -79297,7 +79358,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:489
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 "
@@ -79305,7 +79366,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:494
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -79313,7 +79374,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:495
+#: ../v2v/virt-v2v.pod:496
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -79321,7 +79382,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:498
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -79331,7 +79392,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:502
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -79339,7 +79400,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:504
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -79347,7 +79408,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:505
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -79355,7 +79416,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:507
+#: ../v2v/virt-v2v.pod:508
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -79363,7 +79424,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:510
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -79371,7 +79432,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -79379,7 +79440,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:513
+#: ../v2v/virt-v2v.pod:514
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -79388,12 +79449,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -79401,7 +79462,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:524
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -79411,14 +79472,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:529
+#: ../v2v/virt-v2v.pod:530
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79429,21 +79490,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:538
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:541
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:544
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -79451,12 +79512,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:546
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:548
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -79464,14 +79525,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:549
+#: ../v2v/virt-v2v.pod:550
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:553
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -79482,7 +79543,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:558
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -79490,22 +79551,22 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:559
+#: ../v2v/virt-v2v.pod:560
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:562
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
msgid "Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:567
msgid ""
"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
"should be I<-i libvirt>. As this is the default, you don't need to specify "
@@ -79513,12 +79574,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:571
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:572
+#: ../v2v/virt-v2v.pod:573
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -79526,7 +79587,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:574
+#: ../v2v/virt-v2v.pod:575
msgid ""
"where C<user@> is the (optional, but recommended) user to connect as, "
"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -79535,24 +79596,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:580
msgid "For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:581
+#: ../v2v/virt-v2v.pod:582
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:584
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:587
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -79561,7 +79622,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:590
#, no-wrap
msgid ""
" Id Name State\n"
@@ -79572,7 +79633,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
msgid ""
"If you get an error \"Peer certificate cannot be authenticated with given CA "
"certificates\" or similar, then you can either import the ESX host's "
@@ -79581,7 +79642,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:599
+#: ../v2v/virt-v2v.pod:600
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list "
@@ -79590,14 +79651,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:601
+#: ../v2v/virt-v2v.pod:602
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:605
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows "
@@ -79610,7 +79671,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -79618,17 +79679,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:614
+#: ../v2v/virt-v2v.pod:615
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:618
+#: ../v2v/virt-v2v.pod:619
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' "
@@ -79639,12 +79700,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622
+#: ../v2v/virt-v2v.pod:623
msgid "where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:626
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -79652,7 +79713,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:629
+#: ../v2v/virt-v2v.pod:630
msgid ""
"In this case the output flags are set to write the converted guest to a "
"temporary directory as this is just an example, but you can also write to "
@@ -79660,52 +79721,52 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:633
+#: ../v2v/virt-v2v.pod:634
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:636
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:642
+#: ../v2v/virt-v2v.pod:643
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:647
+#: ../v2v/virt-v2v.pod:648
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:652
+#: ../v2v/virt-v2v.pod:653
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:657
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:663
+#: ../v2v/virt-v2v.pod:664
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:666
+#: ../v2v/virt-v2v.pod:667
#, no-wrap
msgid ""
" virt-v2v [...] -o local -os /var/tmp\n"
@@ -79713,12 +79774,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:668
+#: ../v2v/virt-v2v.pod:669
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:671
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -79727,17 +79788,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:677
+#: ../v2v/virt-v2v.pod:678
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -79747,14 +79808,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:688
+#: ../v2v/virt-v2v.pod:689
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -79766,7 +79827,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:694
+#: ../v2v/virt-v2v.pod:695
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 "
@@ -79774,7 +79835,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:698
+#: ../v2v/virt-v2v.pod:699
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -79786,12 +79847,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:707
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:708
+#: ../v2v/virt-v2v.pod:709
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -79799,19 +79860,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:713
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -79819,7 +79880,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -79852,7 +79913,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:751
+#: ../v2v/virt-v2v.pod:752
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 "
@@ -79860,14 +79921,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:758
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:760
+#: ../v2v/virt-v2v.pod:761
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -79877,7 +79938,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:789
+#: ../v2v/virt-v2v.pod:790
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 "
@@ -79885,36 +79946,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:795
+#: ../v2v/virt-v2v.pod:796
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:802
+#: ../v2v/virt-v2v.pod:803
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804 ../v2v/virt-v2v.pod:858
+#: ../v2v/virt-v2v.pod:805 ../v2v/virt-v2v.pod:859
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:806
+#: ../v2v/virt-v2v.pod:807
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:816
+#: ../v2v/virt-v2v.pod:817
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -79924,31 +79985,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:837
+#: ../v2v/virt-v2v.pod:838
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:849
+#: ../v2v/virt-v2v.pod:850
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:851
+#: ../v2v/virt-v2v.pod:852
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:856
+#: ../v2v/virt-v2v.pod:857
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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. "
@@ -79958,14 +80019,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:866
+#: ../v2v/virt-v2v.pod:867
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:877
+#: ../v2v/virt-v2v.pod:878
msgid ""
"L<virt-p2v(1)>, L<virt-customize(1)>, L<virt-df(1)>, L<virt-filesystems(1)>, "
"L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<guestfs(3)>, L<guestfish(1)>, "
@@ -79973,6 +80034,6 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:894
+#: ../v2v/virt-v2v.pod:895
msgid "Mike Latimer"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index a69567f..9761618 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-29 22:42+0200\n"
+"POT-Creation-Date: 2014-09-01 17:39+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/"
@@ -393,11 +393,11 @@ msgstr ""
#: ../fish/virt-tar-out.pod:34 ../format/virt-format.pod:57
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
-#: ../p2v/virt-p2v.pod:178 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:203 ../rescue/virt-rescue.pod:113
#: ../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:131
+#: ../tools/virt-tar:100 ../tools/virt-win-reg:93 ../v2v/virt-v2v.pod:133
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
@@ -412,11 +412,11 @@ msgstr "ПАРАМЕТРИ"
#: ../fish/guestfish.pod:156 ../format/virt-format.pod:61
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
-#: ../p2v/virt-p2v.pod:182 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:207 ../rescue/virt-rescue.pod:117
#: ../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:135
+#: ../tools/virt-tar:108 ../tools/virt-win-reg:101 ../v2v/virt-v2v.pod:137
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:330
+#: ../v2v/virt-v2v.pod:331
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:332
+#: ../sysprep/virt-sysprep.pod:213 ../v2v/virt-v2v.pod:333
msgid "B<--quiet>"
msgstr "B<--quiet>"
@@ -786,10 +786,10 @@ msgstr ""
#: ../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
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:216
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:577
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:219
-#: ../v2v/virt-v2v.pod:417
+#: ../v2v/virt-v2v.pod:418
msgid "B<-v>"
msgstr "B<-v>"
@@ -801,10 +801,10 @@ msgstr "B<-v>"
#: ../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
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:218
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:221
-#: ../v2v/virt-v2v.pod:419
+#: ../v2v/virt-v2v.pod:420
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:421
+#: ../v2v/virt-v2v.pod:422
msgid "Enable verbose messages for debugging."
msgstr "Увімкнути докладний показ повідомлень з метою діагностики."
@@ -831,10 +831,10 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../fish/guestfish.pod:426 ../format/virt-format.pod:159
#: ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:203
-#: ../p2v/virt-p2v.pod:197 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:222 ../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:423
+#: ../v2v/virt-v2v.pod:424
msgid "B<-V>"
msgstr "B<-V>"
@@ -849,11 +849,11 @@ msgstr "B<-V>"
#: ../fish/guestfish.pod:428 ../format/virt-format.pod:161
#: ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:205
-#: ../p2v/virt-p2v.pod:199 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:224 ../rescue/virt-rescue.pod:246
#: ../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:425
+#: ../tools/virt-tar:116 ../tools/virt-win-reg:109 ../v2v/virt-v2v.pod:426
msgid "B<--version>"
msgstr "B<--version>"
@@ -864,11 +864,11 @@ msgstr "B<--version>"
#: ../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
+#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v.pod:226
#: ../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:427
+#: ../tools/virt-tar:118 ../tools/virt-win-reg:111 ../v2v/virt-v2v.pod:428
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:438
+#: ../v2v/virt-v2v.pod:439
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:440
+#: ../v2v/virt-v2v.pod:441
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:346 ../v2v/virt-v2v.pod:350
-#: ../v2v/virt-v2v.pod:354 ../v2v/virt-v2v.pod:640 ../v2v/virt-v2v.pod:645
-#: ../v2v/virt-v2v.pod:650
+#: ../tools/virt-win-reg:766 ../v2v/virt-v2v.pod:347 ../v2v/virt-v2v.pod:351
+#: ../v2v/virt-v2v.pod:355 ../v2v/virt-v2v.pod:641 ../v2v/virt-v2v.pod:646
+#: ../v2v/virt-v2v.pod:651
msgid "*"
msgstr "*"
@@ -1453,13 +1453,13 @@ msgstr ""
#: ../inspector/virt-inspector.pod:492 ../java/examples/guestfs-java.pod:156
#: ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215
#: ../ocaml/examples/guestfs-ocaml.pod:76 ../p2v-iso/guestfs-p2v-iso.pod:224
-#: ../p2v/virt-p2v.pod:205 ../perl/examples/guestfs-perl.pod:38
+#: ../p2v/virt-p2v.pod:230 ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:751 ../ruby/examples/guestfs-ruby.pod:34
#: ../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:875
+#: ../tools/virt-tar:292 ../tools/virt-win-reg:785 ../v2v/virt-v2v.pod:876
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
@@ -1495,11 +1495,11 @@ msgstr "АВТОР"
#: ../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-rescue.pod:424
+#: ../p2v/virt-p2v.pod:238 ../rescue/virt-rescue.pod:424
#: ../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:890
+#: ../tools/virt-win-reg:801 ../v2v/virt-v2v.pod:891
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
@@ -1523,13 +1523,13 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:515 ../java/examples/guestfs-java.pod:175
#: ../lua/examples/guestfs-lua.pod:155 ../make-fs/virt-make-fs.pod:233
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../p2v-iso/guestfs-p2v-iso.pod:236
-#: ../p2v/virt-p2v.pod:217 ../perl/examples/guestfs-perl.pod:57
+#: ../p2v/virt-p2v.pod:242 ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:778 ../ruby/examples/guestfs-ruby.pod:52
#: ../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:896
+#: ../tools/virt-tar:310 ../tools/virt-win-reg:803 ../v2v/virt-v2v.pod:897
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:812
+#: ../v2v/virt-v2v.pod:813
msgid "ENVIRONMENT VARIABLES"
msgstr "ЗМІННІ СЕРЕДОВИЩА"
@@ -1879,11 +1879,11 @@ msgstr ""
#: ../fuse/guestunmount.pod:156 ../golang/examples/guestfs-golang.pod:91
#: ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
-#: ../p2v/virt-p2v.pod:211 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:236 ../perl/examples/guestfs-perl.pod:53
#: ../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:888
+#: ../v2v/virt-v2v.pod:889
msgid "AUTHORS"
msgstr "АВТОРИ"
@@ -1911,9 +1911,9 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../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
+#: ../p2v/virt-p2v.pod:244 ../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:898
+#: ../tools/virt-list-partitions:280 ../v2v/virt-v2v.pod:899
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr "© Red Hat Inc., 2009–2014"
@@ -2408,8 +2408,8 @@ 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:137
+#: ../p2v/virt-p2v.pod:209 ../resize/virt-resize.pod:272
+#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:139
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:195
+#: ../sparsify/virt-sparsify.pod:223 ../v2v/virt-v2v.pod:197
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:197
+#: ../sparsify/virt-sparsify.pod:225 ../v2v/virt-v2v.pod:199
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:661 ../v2v/virt-v2v.pod:774
+#: ../src/guestfs.pod:3883 ../v2v/virt-v2v.pod:662 ../v2v/virt-v2v.pod:775
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:675 ../v2v/virt-v2v.pod:781
+#: ../src/guestfs.pod:3908 ../v2v/virt-v2v.pod:676 ../v2v/virt-v2v.pod:782
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:683
-#: ../v2v/virt-v2v.pod:787
+#: ../src/guestfs.pod:1827 ../src/guestfs.pod:2399 ../v2v/virt-v2v.pod:684
+#: ../v2v/virt-v2v.pod:788
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:704
+#: ../v2v/virt-v2v.pod:705
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:749
+#: ../sparsify/virt-sparsify.pod:340 ../v2v/virt-v2v.pod:750
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:764
+#: ../sparsify/virt-sparsify.pod:356 ../v2v/virt-v2v.pod:765
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:835
+#: ../sysprep/virt-sysprep.pod:522 ../v2v/virt-v2v.pod:836
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:840
+#: ../sysprep/virt-sysprep.pod:527 ../v2v/virt-v2v.pod:841
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:843
+#: ../sysprep/virt-sysprep.pod:530 ../v2v/virt-v2v.pod:844
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:847
+#: ../sysprep/virt-sysprep.pod:534 ../v2v/virt-v2v.pod:848
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:854
+#: ../sysprep/virt-sysprep.pod:540 ../v2v/virt-v2v.pod:855
msgid "See also: C<https://github.com/rwmjones/rhsrvany>"
msgstr ""
@@ -7918,7 +7918,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:572 ../guestfs-release-notes.pod:576
#: ../guestfs-release-notes.pod:921 ../guestfs-release-notes.pod:925
#: ../guestfs-release-notes.pod:1477 ../guestfs-release-notes.pod:1481
-#: ../p2v/virt-p2v.pod:168 ../p2v/virt-p2v.pod:174
+#: ../p2v/virt-p2v.pod:193 ../p2v/virt-p2v.pod:199
#: ../src/guestfs-actions.pod:1 ../src/guestfs-actions.pod:24
#: ../src/guestfs-availability.pod:1 ../src/guestfs-availability.pod:24
#: ../src/guestfs-structs.pod:1 ../src/guestfs-structs.pod:24
@@ -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:873
+#: ../sysprep/virt-sysprep.pod:546 ../v2v/virt-v2v.pod:874
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:798
+#: ../v2v/virt-v2v.pod:799
msgid "FILES"
msgstr "ФАЙЛИ"
@@ -50632,7 +50632,7 @@ msgid ""
" PROMPT 0\n"
" LABEL p2v\n"
" KERNEL virt-p2v-vmlinuz\n"
-" APPEND initrd=virt-p2v-initrd p2v.server=conv.example.com p2v.password=secret\n"
+" APPEND initrd=virt-p2v-initrd p2v.server=conv.example.com p2v.password=secret p2v.output=libvirt\n"
"\n"
msgstr ""
@@ -50824,48 +50824,109 @@ msgstr ""
#. type: =item
#: ../p2v/virt-p2v.pod:164
-msgid "B<ip=dhcp>"
+msgid "B<p2v.output=[libvirt|local|...]>"
msgstr ""
#. type: textblock
#: ../p2v/virt-p2v.pod:166
+msgid ""
+"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:169
+msgid ""
+"If not specified, the default is C<local>, and the converted guest is "
+"written to C</var/tmp>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:172
+msgid "B<p2v.output_allocation=sparse|preallocated>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:174
+msgid ""
+"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
+"option. See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:177
+msgid "B<p2v.output_format=raw|sparse|...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:179
+msgid ""
+"Set the output format. This is the same as the virt-v2v I<-oa> option. See "
+"L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:182
+msgid "B<p2v.output_storage=...>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:184
+msgid ""
+"Set the output storage. This is the same as the virt-v2v I<-os> option. "
+"See L<virt-v2v(1)/OPTIONS>."
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:187
+msgid ""
+"If not specified, the default is C</var/tmp> (on the conversion server)."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:189
+msgid "B<ip=dhcp>"
+msgstr ""
+
+#. type: textblock
+#: ../p2v/virt-p2v.pod:191
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:170
+#: ../p2v/virt-p2v.pod:195
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:172
+#: ../p2v/virt-p2v.pod:197
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:186
+#: ../p2v/virt-p2v.pod:211
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:188
+#: ../p2v/virt-p2v.pod:213
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:220
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:207
+#: ../p2v/virt-p2v.pod:232
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:892
+#: ../p2v/virt-p2v.pod:240 ../v2v/virt-v2v.pod:893
msgid "Matthew Booth"
msgstr ""
@@ -52404,7 +52465,7 @@ msgstr "Увімкнути показ діагностичних повідом
#. type: =item
#: ../resize/virt-resize.pod:338 ../sparsify/virt-sparsify.pod:186
-#: ../v2v/virt-v2v.pod:143
+#: ../v2v/virt-v2v.pod:145
msgid "B<--debug-gc>"
msgstr "B<--debug-gc>"
@@ -52869,7 +52930,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:601 ../sparsify/virt-sparsify.pod:346
-#: ../v2v/virt-v2v.pod:755
+#: ../v2v/virt-v2v.pod:756
msgid "There are two ways to use this option."
msgstr "Існує два способи використання цього параметра."
@@ -52902,7 +52963,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:616 ../sparsify/virt-sparsify.pod:359
-#: ../v2v/virt-v2v.pod:767
+#: ../v2v/virt-v2v.pod:768
msgid ""
"Secondly use the option in conjunction with other options to make the "
"regular program output more machine friendly."
@@ -52910,13 +52971,13 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:619 ../sparsify/virt-sparsify.pod:362
-#: ../v2v/virt-v2v.pod:770
+#: ../v2v/virt-v2v.pod:771
msgid "At the moment this means:"
msgstr "У поточній версії це означає таке:"
#. type: textblock
#: ../resize/virt-resize.pod:625 ../sparsify/virt-sparsify.pod:368
-#: ../v2v/virt-v2v.pod:776
+#: ../v2v/virt-v2v.pod:777
msgid ""
"Progress bar messages can be parsed from stdout by looking for this regular "
"expression:"
@@ -52924,7 +52985,7 @@ msgstr ""
#. type: verbatim
#: ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:371
-#: ../v2v/virt-v2v.pod:779
+#: ../v2v/virt-v2v.pod:780
#, no-wrap
msgid ""
" ^[0-9]+/[0-9]+$\n"
@@ -52935,7 +52996,7 @@ msgstr ""
#. type: textblock
#: ../resize/virt-resize.pod:632 ../sparsify/virt-sparsify.pod:375
-#: ../v2v/virt-v2v.pod:783
+#: ../v2v/virt-v2v.pod:784
msgid ""
"The calling program should treat messages sent to stdout (except for "
"progress bar messages) as status messages. They can be logged and/or "
@@ -53611,7 +53672,7 @@ msgstr ""
"\n"
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:334
+#: ../sparsify/virt-sparsify.pod:247 ../v2v/virt-v2v.pod:335
msgid "This disables progress bars and other unnecessary output."
msgstr ""
@@ -53791,7 +53852,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:818
+#: ../sparsify/virt-sparsify.pod:401 ../v2v/virt-v2v.pod:819
msgid ""
"Location of the temporary directory used for the potentially large temporary "
"overlay file."
@@ -53805,7 +53866,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:821
+#: ../sparsify/virt-sparsify.pod:407 ../v2v/virt-v2v.pod:822
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 "
@@ -53813,7 +53874,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:825
+#: ../sparsify/virt-sparsify.pod:411 ../v2v/virt-v2v.pod:826
msgid "This defaults to C</tmp>."
msgstr "Типовим значенням є C</tmp>."
@@ -53828,7 +53889,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:833
+#: ../sparsify/virt-sparsify.pod:419 ../v2v/virt-v2v.pod:834
#, no-wrap
msgid ""
" mount -o remount,size=10G /tmp\n"
@@ -86533,7 +86594,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:125
+#: ../v2v/virt-v2v.pod:12 ../v2v/virt-v2v.pod:127
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86546,7 +86607,7 @@ msgstr ""
"\n"
#. type: verbatim
-#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:115
+#: ../v2v/virt-v2v.pod:14 ../v2v/virt-v2v.pod:117
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -86565,7 +86626,7 @@ msgstr ""
#| " virt-builder fedora-20 -o mydisk.img\n"
#| "\n"
msgid ""
-" virt-v2v -i disk disk.img -o glance -os glance_image_name\n"
+" virt-v2v -i disk disk.img -o glance\n"
"\n"
msgstr ""
" virt-builder fedora-20 -o mydisk.img\n"
@@ -86748,29 +86809,38 @@ msgid ""
"on OpenStack (only KVM-based OpenStack is supported), you can do:"
msgstr ""
-#. type: =head2
+#. type: textblock
#: ../v2v/virt-v2v.pod:110
#, fuzzy
+#| msgid "To run this tool on a disk image directly, use the I<-a> option:"
+msgid "To control the name of the image in glance, use the I<-on> option."
+msgstr ""
+"Щоб запустити цю програму безпосередньо для образу диска, скористайтеся "
+"параметром I<-a>:"
+
+#. type: =head2
+#: ../v2v/virt-v2v.pod:112
+#, fuzzy
#| msgid "Create empty disk images"
msgid "Convert disk image to disk image"
msgstr "Створення порожніх образів дисків"
#. type: textblock
-#: ../v2v/virt-v2v.pod:112
+#: ../v2v/virt-v2v.pod:114
msgid ""
"Given a disk image from another hypervisor that you want to convert to run "
"on KVM, you have two options. The simplest way is to try:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:117
+#: ../v2v/virt-v2v.pod:119
msgid ""
"where virt-v2v guesses everything about the input C<disk.img> and (in this "
"case) writes the converted result to C</var/tmp>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:120
+#: ../v2v/virt-v2v.pod:122
msgid ""
"A more complex method is to write some L<libvirt XML|http://libvirt.org/"
"formatdomain.html> describing the input guest (if you can get the source "
@@ -86779,47 +86849,47 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:127
+#: ../v2v/virt-v2v.pod:129
msgid ""
"Since C<guest-domain.xml> contains the path(s) to the guest disk image(s) "
"you do not need to specify the name of the disk image on the command line."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:139
+#: ../v2v/virt-v2v.pod:141
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> ..."
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:141
+#: ../v2v/virt-v2v.pod:143
#, fuzzy
#| msgid "B<--network>"
msgid "See I<--network> below."
msgstr "B<--network>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:145
+#: ../v2v/virt-v2v.pod:147
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:149
+#: ../v2v/virt-v2v.pod:151
#, fuzzy
#| msgid "B<gdisk>"
msgid "B<-i disk>"
msgstr "B<gdisk>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:151
+#: ../v2v/virt-v2v.pod:153
msgid "Set the input method to I<disk>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:153
+#: ../v2v/virt-v2v.pod:155
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 "
@@ -86829,34 +86899,34 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:159
+#: ../v2v/virt-v2v.pod:161
msgid "B<-i libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:161
+#: ../v2v/virt-v2v.pod:163
msgid "Set the input method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:163
+#: ../v2v/virt-v2v.pod:165
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:166
+#: ../v2v/virt-v2v.pod:168
msgid "B<-i libvirtxml>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:168
+#: ../v2v/virt-v2v.pod:170
msgid "Set the input method to I<libvirtxml>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:170
+#: ../v2v/virt-v2v.pod:172
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 "
@@ -86865,83 +86935,83 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:175
+#: ../v2v/virt-v2v.pod:177
#, fuzzy
#| msgid "B<-i>"
msgid "B<-i local>"
msgstr "B<-i>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:177
+#: ../v2v/virt-v2v.pod:179
msgid "This is the same as I<-i disk>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:179
+#: ../v2v/virt-v2v.pod:181
msgid "B<-ic> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:181
+#: ../v2v/virt-v2v.pod:183
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:184
+#: ../v2v/virt-v2v.pod:186
msgid ""
"Only local libvirt connections and ESX connections can be used. Remote "
"libvirt connections will not work in general."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:187
+#: ../v2v/virt-v2v.pod:189
msgid "See also L</INPUT FROM VMWARE VCENTER SERVER> below."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:189
+#: ../v2v/virt-v2v.pod:191
#, fuzzy
#| msgid "B<--format>"
msgid "B<-if> format"
msgstr "B<--format>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:191
+#: ../v2v/virt-v2v.pod:193
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:201
+#: ../v2v/virt-v2v.pod:203
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> in:out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:203
+#: ../v2v/virt-v2v.pod:205
#, fuzzy
#| msgid "B<--network>"
msgid "B<--network> out"
msgstr "B<--network>"
#. type: =item
-#: ../v2v/virt-v2v.pod:205
+#: ../v2v/virt-v2v.pod:207
msgid "B<--bridge> in:out"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:207
+#: ../v2v/virt-v2v.pod:209
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--bridge> out"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:209
+#: ../v2v/virt-v2v.pod:211
msgid ""
"Map network (or bridge) called C<in> to network (or bridge) called C<out>. "
"If no C<in:> prefix is given, all other networks (or bridges) are mapped to "
@@ -86949,28 +87019,28 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:213
+#: ../v2v/virt-v2v.pod:215
#, fuzzy
#| msgid "See L</OPENING DISKS FOR READ AND WRITE> below."
msgid "See L</NETWORKS AND BRIDGES> below."
msgstr "Див. L</OPENING DISKS FOR READ AND WRITE> нижче."
#. type: =item
-#: ../v2v/virt-v2v.pod:215
+#: ../v2v/virt-v2v.pod:217
#, fuzzy
#| msgid "B<--no-sync>"
msgid "B<--no-copy>"
msgstr "B<--no-sync>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:217
+#: ../v2v/virt-v2v.pod:219
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:220
+#: ../v2v/virt-v2v.pod:222
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 "
@@ -86978,67 +87048,68 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:224
+#: ../v2v/virt-v2v.pod:226
msgid ""
"This option is not compatible with I<-o libvirt> since it would create a "
"faulty guest (one with no disks)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:227
+#: ../v2v/virt-v2v.pod:229
msgid "This option is not compatible with I<-o glance> for technical reasons."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:229
+#: ../v2v/virt-v2v.pod:231
#, fuzzy
#| msgid "B<-o kernel_cache>"
msgid "B<-o glance>"
msgstr "B<-o kernel_cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:231
+#: ../v2v/virt-v2v.pod:233
msgid ""
"Set the output method to OpenStack Glance. In this mode the converted guest "
-"is uploaded to Glance as the image named in the I<-os> parameter."
+"is uploaded to Glance. You can control the image name by setting the I<-on> "
+"option."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:234
+#: ../v2v/virt-v2v.pod:237
msgid "B<-o libvirt>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:236
+#: ../v2v/virt-v2v.pod:239
msgid "Set the output method to I<libvirt>. This is the default."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:238
+#: ../v2v/virt-v2v.pod:241
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:241
+#: ../v2v/virt-v2v.pod:244
#, 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:243
+#: ../v2v/virt-v2v.pod:246
msgid "B<-o local>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:245
+#: ../v2v/virt-v2v.pod:248
msgid "Set the output method to I<local>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:247
+#: ../v2v/virt-v2v.pod:250
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 "
@@ -87046,7 +87117,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:251
+#: ../v2v/virt-v2v.pod:254
#, no-wrap
msgid ""
" /dir/disk-sda\n"
@@ -87056,36 +87127,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:255
+#: ../v2v/virt-v2v.pod:258
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:258
+#: ../v2v/virt-v2v.pod:261
#, fuzzy
#| msgid "B<-o option>"
msgid "B<-o ovirt>"
msgstr "B<-o параметр>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:260
+#: ../v2v/virt-v2v.pod:263
msgid "This is the same as I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:262
+#: ../v2v/virt-v2v.pod:265
msgid "B<-o rhev>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:264
+#: ../v2v/virt-v2v.pod:267
msgid "Set the output method to I<rhev>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:266
+#: ../v2v/virt-v2v.pod:269
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 "
@@ -87094,102 +87165,97 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:271
+#: ../v2v/virt-v2v.pod:274
msgid "B<-oa sparse>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:273
+#: ../v2v/virt-v2v.pod:276
msgid "B<-oa preallocated>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:275
+#: ../v2v/virt-v2v.pod:278
msgid "Set the output file allocation mode. The default is C<sparse>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:277
+#: ../v2v/virt-v2v.pod:280
msgid "B<-oc> libvirtURI"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:279
+#: ../v2v/virt-v2v.pod:282
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:282
+#: ../v2v/virt-v2v.pod:285
msgid ""
"Only local libvirt connections can be used. Remote libvirt connections will "
"not work."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:285
+#: ../v2v/virt-v2v.pod:288
msgid "B<-of> format"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:287
+#: ../v2v/virt-v2v.pod:290
msgid "When converting the guest, convert the disks to the given format."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:289
+#: ../v2v/virt-v2v.pod:292
msgid "If not specified, then the input format is used."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:291
+#: ../v2v/virt-v2v.pod:294
msgid "B<-on> name"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:293
+#: ../v2v/virt-v2v.pod:296
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:296
+#: ../v2v/virt-v2v.pod:299
msgid "B<-os> storage"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:298
+#: ../v2v/virt-v2v.pod:301
msgid "The location of the storage for the converted guest."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:300
-msgid "For I<-o glance>, this is the Glance image name."
-msgstr ""
-
-#. type: textblock
-#: ../v2v/virt-v2v.pod:302
+#: ../v2v/virt-v2v.pod:303
msgid ""
"For I<-o libvirt>, this is a libvirt directory pool (see S<C<virsh pool-"
"list>>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:305
+#: ../v2v/virt-v2v.pod:306
msgid "For I<-o local>, this is a directory name. The directory must exist."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:307
+#: ../v2v/virt-v2v.pod:308
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:310
+#: ../v2v/virt-v2v.pod:311
#, no-wrap
msgid ""
" rhev-storage.example.com:/rhev/export\n"
@@ -87197,7 +87263,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:312
+#: ../v2v/virt-v2v.pod:313
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. "
@@ -87205,7 +87271,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:316
+#: ../v2v/virt-v2v.pod:317
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 "
@@ -87213,21 +87279,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:321
+#: ../v2v/virt-v2v.pod:322
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:324
+#: ../v2v/virt-v2v.pod:325
#, fuzzy
#| msgid "B<--print-cache>"
msgid "B<--print-source>"
msgstr "B<--print-cache>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:326
+#: ../v2v/virt-v2v.pod:327
msgid ""
"Print information about the source guest and stop. This option is useful "
"when you are setting up network and bridge maps. See L</NETWORKS AND "
@@ -87235,105 +87301,105 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:336
+#: ../v2v/virt-v2v.pod:337
msgid "B<--rhev-image-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:338
+#: ../v2v/virt-v2v.pod:339
msgid "B<--rhev-vol-uuid> UUID"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:340
+#: ../v2v/virt-v2v.pod:341
#, fuzzy
#| msgid "B<lvm-uuids> *"
msgid "B<--rhev-vm-uuid> UUID"
msgstr "B<lvm-uuids> *"
#. type: textblock
-#: ../v2v/virt-v2v.pod:342
+#: ../v2v/virt-v2v.pod:343
msgid "Normally the RHEV output mode chooses a random UUID for each of:"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:348
+#: ../v2v/virt-v2v.pod:349
msgid "the image directory (I<--rhev-image-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:352
+#: ../v2v/virt-v2v.pod:353
msgid "once for each guest disk (I<--rhev-vol-uuid>)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:356
+#: ../v2v/virt-v2v.pod:357
msgid "the VM and OVF file (I<--rhev-vm-uuid>)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:360
+#: ../v2v/virt-v2v.pod:361
msgid "However you can force specific UUIDs instead by using these options."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:362
+#: ../v2v/virt-v2v.pod:363
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:365
+#: ../v2v/virt-v2v.pod:366
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:369
+#: ../v2v/virt-v2v.pod:370
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:372
+#: ../v2v/virt-v2v.pod:373
msgid "These options can only be used with I<-o rhev>."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:374
+#: ../v2v/virt-v2v.pod:375
msgid "B<--root ask>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:376
+#: ../v2v/virt-v2v.pod:377
msgid "B<--root single>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:378
+#: ../v2v/virt-v2v.pod:379
msgid "B<--root first>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:380
+#: ../v2v/virt-v2v.pod:381
msgid "B<--root> /dev/sdX"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:382
+#: ../v2v/virt-v2v.pod:383
msgid "B<--root> /dev/VG/LV"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:384
+#: ../v2v/virt-v2v.pod:385
msgid "Choose the root filesystem to be converted."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:386
+#: ../v2v/virt-v2v.pod:387
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 "
@@ -87344,14 +87410,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:394
+#: ../v2v/virt-v2v.pod:395
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:397
+#: ../v2v/virt-v2v.pod:398
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 "
@@ -87360,7 +87426,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:402
+#: ../v2v/virt-v2v.pod:403
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 "
@@ -87368,7 +87434,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:406
+#: ../v2v/virt-v2v.pod:407
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 "
@@ -87377,7 +87443,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:411
+#: ../v2v/virt-v2v.pod:412
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 "
@@ -87387,19 +87453,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:429
+#: ../v2v/virt-v2v.pod:430
msgid "B<--vmtype desktop>"
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:431
+#: ../v2v/virt-v2v.pod:432
#, fuzzy
#| msgid "B<--merge>"
msgid "B<--vmtype server>"
msgstr "B<--merge>"
#. type: textblock
-#: ../v2v/virt-v2v.pod:433
+#: ../v2v/virt-v2v.pod:434
msgid ""
"For the RHEV target only, specify the type of guest. You can set this to "
"C<desktop> or C<server>. If the option is not given, then a suitable "
@@ -87407,12 +87473,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:444
+#: ../v2v/virt-v2v.pod:445
msgid "XEN PARAVIRTUALIZED GUESTS"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:446
+#: ../v2v/virt-v2v.pod:447
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 "
@@ -87421,7 +87487,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:451
+#: ../v2v/virt-v2v.pod:452
msgid ""
"Therefore before conversion you should check that a regular kernel is "
"installed. For some older Linux distributions, this means installing a "
@@ -87429,7 +87495,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:455
+#: ../v2v/virt-v2v.pod:456
#, no-wrap
msgid ""
" RHEL 3 (Does not apply, as there was no Xen PV kernel)\n"
@@ -87437,7 +87503,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:457
+#: ../v2v/virt-v2v.pod:458
#, no-wrap
msgid ""
" RHEL 4 i686 with > 10GB of RAM: install 'kernel-hugemem'\n"
@@ -87450,7 +87516,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:464
+#: ../v2v/virt-v2v.pod:465
#, no-wrap
msgid ""
" RHEL 5 i686: install 'kernel-PAE'\n"
@@ -87459,7 +87525,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:467
+#: ../v2v/virt-v2v.pod:468
#, no-wrap
msgid ""
" SLES 10 i586 with > 10GB of RAM: install 'kernel-bigsmp'\n"
@@ -87471,7 +87537,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:473
+#: ../v2v/virt-v2v.pod:474
#, no-wrap
msgid ""
" SLES 11+ i586: install 'kernel-pae'\n"
@@ -87480,7 +87546,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:476
+#: ../v2v/virt-v2v.pod:477
#, no-wrap
msgid ""
" Windows (Does not apply, as there is no Xen PV Windows kernel)\n"
@@ -87488,19 +87554,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:478
+#: ../v2v/virt-v2v.pod:479
msgid "ENABLING VIRTIO"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:480
+#: ../v2v/virt-v2v.pod:481
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:483
+#: ../v2v/virt-v2v.pod:484
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 "
@@ -87508,7 +87574,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:488
+#: ../v2v/virt-v2v.pod:489
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 "
@@ -87516,7 +87582,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:493
+#: ../v2v/virt-v2v.pod:494
#, no-wrap
msgid ""
" RHEL 3 No virtio drivers are available\n"
@@ -87524,7 +87590,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:495
+#: ../v2v/virt-v2v.pod:496
#, no-wrap
msgid ""
" RHEL 4 kernel >= 2.5.9-89.EL\n"
@@ -87532,7 +87598,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:497
+#: ../v2v/virt-v2v.pod:498
#, no-wrap
msgid ""
" RHEL 5 kernel >= 2.6.18-128.el5\n"
@@ -87542,7 +87608,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:501
+#: ../v2v/virt-v2v.pod:502
#, no-wrap
msgid ""
" RHEL 6+ All versions support virtio\n"
@@ -87550,7 +87616,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:503
+#: ../v2v/virt-v2v.pod:504
#, no-wrap
msgid ""
" Fedora All versions support virtio\n"
@@ -87558,7 +87624,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:505
+#: ../v2v/virt-v2v.pod:506
#, no-wrap
msgid ""
" SLES 11+ All versions support virtio\n"
@@ -87566,7 +87632,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:507
+#: ../v2v/virt-v2v.pod:508
#, no-wrap
msgid ""
" SLES 10 kernel >= 2.6.16.60-0.85.1\n"
@@ -87574,7 +87640,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:509
+#: ../v2v/virt-v2v.pod:510
#, no-wrap
msgid ""
" OpenSUSE 11+ All versions support virtio\n"
@@ -87582,7 +87648,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:511
+#: ../v2v/virt-v2v.pod:512
#, no-wrap
msgid ""
" OpenSUSE 10 kernel >= 2.6.25.5-1.1\n"
@@ -87590,7 +87656,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:513
+#: ../v2v/virt-v2v.pod:514
#, no-wrap
msgid ""
" Windows Drivers are installed from /usr/share/virtio-win\n"
@@ -87599,12 +87665,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:516
+#: ../v2v/virt-v2v.pod:517
msgid "NETWORKS AND BRIDGES"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:518
+#: ../v2v/virt-v2v.pod:519
msgid ""
"Guests are usually connected to one or more networks, and when converted to "
"the target hypervisor you usually want to reconnect those networks at the "
@@ -87612,7 +87678,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:523
+#: ../v2v/virt-v2v.pod:524
msgid ""
"If you are unsure of what networks and bridges are in use on the source "
"hypervisor, then you can examine the source metadata (libvirt XML, vCenter "
@@ -87622,14 +87688,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:529
+#: ../v2v/virt-v2v.pod:530
msgid ""
"In the I<--print-source> output you will see a section showing the guest's "
"Network Interface Cards (NICs):"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:532
+#: ../v2v/virt-v2v.pod:533
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -87640,21 +87706,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:537
+#: ../v2v/virt-v2v.pod:538
msgid ""
"This is typical of a libvirt guest: It has a single network interface "
"connected to a network called C<default>."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:540
+#: ../v2v/virt-v2v.pod:541
msgid ""
"To map a specific network to a target network, for example C<default> on the "
"source to C<rhevm> on the target, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:543
+#: ../v2v/virt-v2v.pod:544
#, no-wrap
msgid ""
" virt-v2v [...] --network default:rhevm\n"
@@ -87662,12 +87728,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:545
+#: ../v2v/virt-v2v.pod:546
msgid "To map every network to a target network, use:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:547
+#: ../v2v/virt-v2v.pod:548
#, no-wrap
msgid ""
" virt-v2v [...] --network rhevm\n"
@@ -87675,14 +87741,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:549
+#: ../v2v/virt-v2v.pod:550
msgid ""
"Bridges are handled in the same way, but you have to use the I<--bridge> "
"option instead. For example:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:552
+#: ../v2v/virt-v2v.pod:553
#, no-wrap
msgid ""
" $ virt-v2v [-i ...] --print-source name\n"
@@ -87693,7 +87759,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:557
+#: ../v2v/virt-v2v.pod:558
#, no-wrap
msgid ""
" $ virt-v2v [...] --bridge br0:targetbr\n"
@@ -87701,23 +87767,23 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:559
+#: ../v2v/virt-v2v.pod:560
msgid "INPUT FROM VMWARE VCENTER SERVER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:561
+#: ../v2v/virt-v2v.pod:562
msgid "Virt-v2v is able to import guests from VMware vCenter Server."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:563
+#: ../v2v/virt-v2v.pod:564
msgid ""
"Note that virt-v2v B<cannot> import guests directly from an ESXi hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:566
+#: ../v2v/virt-v2v.pod:567
msgid ""
"Virt-v2v uses libvirt for access to vCenter, and therefore the input mode "
"should be I<-i libvirt>. As this is the default, you don't need to specify "
@@ -87725,12 +87791,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:570
+#: ../v2v/virt-v2v.pod:571
msgid "The libvirt URI of a vCenter server looks something like this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:572
+#: ../v2v/virt-v2v.pod:573
#, no-wrap
msgid ""
" vpx://user@server/Datacenter/esxi\n"
@@ -87738,7 +87804,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:574
+#: ../v2v/virt-v2v.pod:575
msgid ""
"where C<user@> is the (optional, but recommended) user to connect as, "
"C<server> is the vCenter Server (I<not> hypervisor), C<Datacenter> is the "
@@ -87747,25 +87813,25 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:579
+#: ../v2v/virt-v2v.pod:580
msgid ""
"For full details of libvirt URIs, see: L<http://libvirt.org/drvesx.html>"
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:581
+#: ../v2v/virt-v2v.pod:582
msgid "ESX: TEST LIBVIRT CONNECTION TO VCENTER"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:583
+#: ../v2v/virt-v2v.pod:584
msgid ""
"Use the L<virsh(1)> command to list the guests on the vCenter Server like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:586
+#: ../v2v/virt-v2v.pod:587
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' list --all\n"
@@ -87774,7 +87840,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:589
+#: ../v2v/virt-v2v.pod:590
#, no-wrap
msgid ""
" Id Name State\n"
@@ -87785,7 +87851,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:594
+#: ../v2v/virt-v2v.pod:595
msgid ""
"If you get an error \"Peer certificate cannot be authenticated with given CA "
"certificates\" or similar, then you can either import the ESX host's "
@@ -87794,7 +87860,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:599
+#: ../v2v/virt-v2v.pod:600
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' list --all\n"
@@ -87802,14 +87868,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:601
+#: ../v2v/virt-v2v.pod:602
msgid ""
"You should also try dumping the metadata from any guest on your server, like "
"this:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:604
+#: ../v2v/virt-v2v.pod:605
#, no-wrap
msgid ""
" $ virsh -c 'vpx://root@esx.example.com/Datacenter/esxi' dumpxml \"Windows 2003\"\n"
@@ -87821,7 +87887,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:610
+#: ../v2v/virt-v2v.pod:611
msgid ""
"B<If the above commands do not work, then virt-v2v is not going to work "
"either>. Fix your libvirt configuration and/or your VMware vCenter Server "
@@ -87829,17 +87895,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../v2v/virt-v2v.pod:614
+#: ../v2v/virt-v2v.pod:615
msgid "ESX: IMPORTING A GUEST"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:616
+#: ../v2v/virt-v2v.pod:617
msgid "To import a particular guest from vCenter Server, do:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:618
+#: ../v2v/virt-v2v.pod:619
#, no-wrap
msgid ""
" $ virt-v2v -ic 'vpx://root@esx.example.com/Datacenter/esxi?no_verify=1' \\\n"
@@ -87849,13 +87915,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:622
+#: ../v2v/virt-v2v.pod:623
msgid ""
"where C<Windows 2003> is the name of the guest (which must be shut down)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:625
+#: ../v2v/virt-v2v.pod:626
msgid ""
"Note that you may be asked for the vCenter password I<twice>. This happens "
"once because libvirt needs it, and a second time because virt-v2v itself "
@@ -87863,7 +87929,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:629
+#: ../v2v/virt-v2v.pod:630
msgid ""
"In this case the output flags are set to write the converted guest to a "
"temporary directory as this is just an example, but you can also write to "
@@ -87871,52 +87937,52 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:633
+#: ../v2v/virt-v2v.pod:634
msgid "OUTPUT TO LIBVIRT"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:635
+#: ../v2v/virt-v2v.pod:636
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:642
+#: ../v2v/virt-v2v.pod:643
msgid ""
"You can only use a local libvirt connection [see below for how to workaround "
"this]."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:647
+#: ../v2v/virt-v2v.pod:648
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:652
+#: ../v2v/virt-v2v.pod:653
msgid "You can only upload to a KVM hypervisor."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:656
+#: ../v2v/virt-v2v.pod:657
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:663
+#: ../v2v/virt-v2v.pod:664
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:666
+#: ../v2v/virt-v2v.pod:667
#, fuzzy, no-wrap
#| msgid ""
#| " virt-builder fedora-20 -o mydisk.img\n"
@@ -87929,14 +87995,14 @@ msgstr ""
"\n"
#. type: textblock
-#: ../v2v/virt-v2v.pod:668
+#: ../v2v/virt-v2v.pod:669
#, fuzzy
#| msgid "This removes temporary files under C</tmp> and C</var/tmp>."
msgid "This creates two (or more) files in C</var/tmp> called:"
msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
#. type: verbatim
-#: ../v2v/virt-v2v.pod:670
+#: ../v2v/virt-v2v.pod:671
#, no-wrap
msgid ""
" /var/tmp/NAME.xml # the libvirt XML (metadata)\n"
@@ -87945,17 +88011,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:673
+#: ../v2v/virt-v2v.pod:674
msgid "(for C<NAME> substitute the guest's name)."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:677
+#: ../v2v/virt-v2v.pod:678
msgid "Upload the converted disk(s) into the storage pool called C<POOL>:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:679
+#: ../v2v/virt-v2v.pod:680
#, no-wrap
msgid ""
" size=$(stat -c%s /var/tmp/NAME-sda)\n"
@@ -87965,14 +88031,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:685
+#: ../v2v/virt-v2v.pod:686
msgid ""
"Edit C</var/tmp/NAME.xml> to change C</var/tmp/NAME-sda> to the pool name. "
"In other words, locate the following bit of XML:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:688
+#: ../v2v/virt-v2v.pod:689
#, no-wrap
msgid ""
" <disk type='file' device='disk'>\n"
@@ -87984,7 +88050,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:694
+#: ../v2v/virt-v2v.pod:695
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 "
@@ -87992,7 +88058,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:698
+#: ../v2v/virt-v2v.pod:699
#, no-wrap
msgid ""
" <disk type='volume' device='disk'>\n"
@@ -88004,12 +88070,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:706
+#: ../v2v/virt-v2v.pod:707
msgid "Define the final guest in libvirt:"
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:708
+#: ../v2v/virt-v2v.pod:709
#, no-wrap
msgid ""
" virsh define /var/tmp/NAME.xml\n"
@@ -88017,19 +88083,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../v2v/virt-v2v.pod:712
+#: ../v2v/virt-v2v.pod:713
msgid "MINIMAL XML FOR -i libvirtxml OPTION"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:714
+#: ../v2v/virt-v2v.pod:715
msgid ""
"When using the I<-i libvirtxml> option, you have to supply some libvirt "
"XML. Writing this from scratch is hard, so the template below is helpful."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:718
+#: ../v2v/virt-v2v.pod:719
msgid ""
"B<Note this should only be used for testing and/or where you know what "
"you're doing!> If you have libvirt metadata for the guest, always use that "
@@ -88037,7 +88103,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../v2v/virt-v2v.pod:722
+#: ../v2v/virt-v2v.pod:723
#, no-wrap
msgid ""
" <domain type='kvm'>\n"
@@ -88070,7 +88136,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:751
+#: ../v2v/virt-v2v.pod:752
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 "
@@ -88078,14 +88144,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:757
+#: ../v2v/virt-v2v.pod:758
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:760
+#: ../v2v/virt-v2v.pod:761
#, no-wrap
msgid ""
" $ virt-v2v --machine-readable\n"
@@ -88095,7 +88161,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:789
+#: ../v2v/virt-v2v.pod:790
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 "
@@ -88103,36 +88169,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:795
+#: ../v2v/virt-v2v.pod:796
msgid ""
"Virt-v2v E<le> 0.9.1 did not support the I<--machine-readable> option at "
"all. The option was added when virt-v2v was rewritten in 2014."
msgstr ""
#. type: =item
-#: ../v2v/virt-v2v.pod:802
+#: ../v2v/virt-v2v.pod:803
msgid "C</usr/share/virtio-win>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:804 ../v2v/virt-v2v.pod:858
+#: ../v2v/virt-v2v.pod:805 ../v2v/virt-v2v.pod:859
msgid "(Optional)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:806
+#: ../v2v/virt-v2v.pod:807
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:816
+#: ../v2v/virt-v2v.pod:817
msgid "C<TMPDIR>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:827
+#: ../v2v/virt-v2v.pod:828
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 "
@@ -88142,31 +88208,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:837
+#: ../v2v/virt-v2v.pod:838
msgid ""
"This can point to the directory containing data files used for Windows "
"conversion."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:849
+#: ../v2v/virt-v2v.pod:850
msgid "(Required when doing conversions of Windows guests)"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:851
+#: ../v2v/virt-v2v.pod:852
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:856
+#: ../v2v/virt-v2v.pod:857
msgid "C<rhev-apt.exe>"
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:860
+#: ../v2v/virt-v2v.pod:861
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. "
@@ -88176,14 +88242,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:866
+#: ../v2v/virt-v2v.pod:867
msgid ""
"This file comes from Red Hat Enterprise Virtualization (RHEV), and is not "
"distributed with virt-v2v."
msgstr ""
#. type: textblock
-#: ../v2v/virt-v2v.pod:877
+#: ../v2v/virt-v2v.pod:878
#, fuzzy
#| msgid ""
#| "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-"
@@ -88199,6 +88265,6 @@ msgstr ""
"libguestfs.org/>."
#. type: textblock
-#: ../v2v/virt-v2v.pod:894
+#: ../v2v/virt-v2v.pod:895
msgid "Mike Latimer"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 3849902..a3523a7 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6772,19 +6775,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8201,54 +8208,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr ""
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr ""
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr ""
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr ""
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 2e9417e..1f2d8dc 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -301,13 +301,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -365,14 +365,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -398,7 +398,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -684,13 +684,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -786,7 +785,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -798,11 +797,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -822,7 +821,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -850,7 +849,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1047,7 +1046,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1135,7 +1134,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1205,7 +1204,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1219,7 +1218,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1287,7 +1286,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1348,7 +1347,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2138,7 +2137,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2197,7 +2196,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2226,7 +2225,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2325,28 +2324,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2378,11 +2373,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2402,7 +2405,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2449,7 +2452,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2519,7 +2522,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2531,7 +2534,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2844,7 +2847,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6893,19 +6896,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8347,54 +8354,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: falló al intentar lanzar dispositivo\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr "libguestfs-test-tool: falló al ejecutar part-disk\n"
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: falló al realizar mkfs.ext2\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: falló al montar /dev/sda1 sobre /\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr "libguestfs-test-tool: falló al tocar el archivo\n"
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "El binario '%s' no existe o no es un ejecutable\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: no parece un directorio fuente de qemu\n"
diff --git a/po/gu.po b/po/gu.po
index 96dceb8..d00428a 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -290,7 +290,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -300,13 +300,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -327,7 +327,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -364,14 +364,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -683,13 +683,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -785,7 +784,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -797,11 +796,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -821,7 +820,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -849,7 +848,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1045,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1134,7 +1133,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1204,7 +1203,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1218,7 +1217,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1347,7 +1346,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2137,7 +2136,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2196,7 +2195,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2225,7 +2224,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2324,28 +2323,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2377,11 +2372,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2401,7 +2404,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2448,7 +2451,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2518,7 +2521,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2530,7 +2533,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2843,7 +2846,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6749,19 +6752,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8178,54 +8185,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: સાધનને શરૂ કરવાનું નિષ્ફળ\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 કરવાનું નિષ્ફળ\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: / પર mount /dev/sda1 કરવાનું નિષ્ફળ\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "બાઇનરી '%s' એ અસ્તિત્વ ધરાવતુ નથી અથવા એક્સિક્યૂટેબલ નથી\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu સ્ત્રોત ડિરેક્ટરીનાં જેવુ લાગતુ નથી\n"
diff --git a/po/hi.po b/po/hi.po
index c068d39..4c51a09 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -290,7 +290,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -300,13 +300,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -327,7 +327,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -364,14 +364,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -683,13 +683,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -785,7 +784,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -797,11 +796,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -821,7 +820,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -849,7 +848,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1045,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1134,7 +1133,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1204,7 +1203,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1218,7 +1217,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1347,7 +1346,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2137,7 +2136,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2196,7 +2195,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2225,7 +2224,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2324,28 +2323,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2377,11 +2372,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2401,7 +2404,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2448,7 +2451,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2518,7 +2521,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2530,7 +2533,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2843,7 +2846,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6747,19 +6750,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8176,54 +8183,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: failed to launch appliance\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: failed to mkfs.ext2\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "द्विपदीय '%s' मौजूद नहीं है या निष्पादनीय नहीं है\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu स्रोत निर्देशिका की तरह नहीं दिखता है\n"
diff --git a/po/kn.po b/po/kn.po
index 550aa40..86601f2 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6751,19 +6754,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8180,54 +8187,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: ಅಪ್ಲೈಯನ್ಸ್ ಅನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 ಅನ್ನು ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: /dev/sda1 ಅನ್ನು / ನಲ್ಲಿ ಆರೋಹಿಸಲಾಗಲಿಲ್ಲ\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "ಬೈನರಿ '%s' ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವ ಅದನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ಇದು ಒಂದು qemu ಆಕರ ಕೋಶದ ರೀತಿ ಕಾಣಿಸುತ್ತಿಲ್ಲ\n"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 9e93e01..35b1796 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.34\n"
+"Project-Id-Version: libguestfs 1.27.35\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-08-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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"
@@ -93,7 +93,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -288,7 +288,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -298,13 +298,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -325,7 +325,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -362,14 +362,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -681,13 +681,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -783,7 +782,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -795,11 +794,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -819,7 +818,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -847,7 +846,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1044,7 +1043,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1132,7 +1131,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1202,7 +1201,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1216,7 +1215,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1284,7 +1283,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1345,7 +1344,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2135,7 +2134,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2194,7 +2193,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2223,7 +2222,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2322,28 +2321,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2375,11 +2370,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2399,7 +2402,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2446,7 +2449,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2516,7 +2519,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2528,7 +2531,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2841,7 +2844,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6737,19 +6740,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8166,54 +8173,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr ""
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr ""
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr ""
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr ""
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 3b86f87..22214cd 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6749,19 +6752,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8178,54 +8185,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: പ്രയോഗം ലഭ്യമാക്കുന്നതില് പരാജയപ്പെട്ടു\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 പരാജയപ്പെട്ടു\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: /dev/sda1 /-ല് മൌണ്ട് ചെയ്യുന്നതില് പരാജയപ്പെട്ടു\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "ബൈനറി '%s' നിലവിലില്ല അല്ലെങ്കില് പ്രവര്ത്തിക്കുന്നില്ല\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu ഉറവിട ഡയറക്ടറിയില് നിന്നും വ്യത്യസ്ഥമാണു്\n"
diff --git a/po/mr.po b/po/mr.po
index 9a1104f..12c8bbe 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -290,7 +290,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -300,13 +300,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -327,7 +327,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -364,14 +364,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -683,13 +683,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -785,7 +784,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -797,11 +796,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -821,7 +820,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -849,7 +848,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1045,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1134,7 +1133,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1204,7 +1203,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1218,7 +1217,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1347,7 +1346,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2137,7 +2136,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2196,7 +2195,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2225,7 +2224,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2324,28 +2323,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2377,11 +2372,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2401,7 +2404,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2448,7 +2451,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2518,7 +2521,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2530,7 +2533,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2843,7 +2846,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6816,19 +6819,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8254,54 +8261,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: अप्लायंस सुरू करण्यास अपयशी\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 अपयशी\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: /dev/sda1 यांस / वर माऊंट करण्यास अपयशी\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "बाइनरी '%s' अस्तित्वात नाही किंवा एक्जीक्यूटेबल नाही\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu स्रोत डिरेक्ट्री प्रमाणे आढळले नाही\n"
diff --git a/po/nl.po b/po/nl.po
index f8f4b5d..b639d97 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -301,13 +301,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -365,14 +365,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -398,7 +398,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -684,13 +684,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -786,7 +785,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -798,11 +797,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -822,7 +821,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -850,7 +849,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1047,7 +1046,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1135,7 +1134,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1205,7 +1204,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1219,7 +1218,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1287,7 +1286,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1348,7 +1347,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2138,7 +2137,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2197,7 +2196,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2226,7 +2225,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2325,28 +2324,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2378,11 +2373,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2402,7 +2405,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2449,7 +2452,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2519,7 +2522,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2531,7 +2534,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2844,7 +2847,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6926,19 +6929,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8397,54 +8404,54 @@ msgstr ""
"libguestfs-test-tool: ontleden van omgevingsvariabelen mislukte.\n"
"Controleer eerdere boodschappen en de output van het 'printenv' commando.\n"
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: toestel lanceren mislukte\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr "libguestfs-test-tool: part-disk draaien mislukte\n"
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 mislukte\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: aankoppelen van /dev/sda1 op / mislukte\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr "libguestfs-test-tool: bestand touchen mislukte\n"
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr "libguestfs-test-tool: afsluiten mislukte\n"
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "Binair programma '%s' bestaat niet of is niet uitvoerbaar\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ziet er niet uit als een qemu bron map\n"
diff --git a/po/or.po b/po/or.po
index c6963fd..2885be6 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6747,19 +6750,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8176,54 +8183,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: ଉପକରଣ ଆରମ୍ଭ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: /dev/sda1 କୁ / ଉପରେ ସ୍ଥାପନ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "ଦ୍ୱୀମିକ '%s' ଅବସ୍ଥିତ ନାହିଁ ଅଥବା ନିଷ୍ପାଦନ ଯୋଗ୍ୟ ନୁହଁ\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ଗୋଟିଏ qemu ଉତ୍ସ ଡିରେକ୍ଟୋରୀ ପରି ଲାଗୁନାହିଁ\n"
diff --git a/po/pa.po b/po/pa.po
index 077c222..7c6323d 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -95,7 +95,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -290,7 +290,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -300,13 +300,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -327,7 +327,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -364,14 +364,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -379,7 +379,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -683,13 +683,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -785,7 +784,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -797,11 +796,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -821,7 +820,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -849,7 +848,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1046,7 +1045,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1134,7 +1133,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1204,7 +1203,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1218,7 +1217,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1286,7 +1285,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1347,7 +1346,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2137,7 +2136,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2196,7 +2195,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2225,7 +2224,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2324,28 +2323,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2377,11 +2372,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2401,7 +2404,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2448,7 +2451,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2518,7 +2521,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2530,7 +2533,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2843,7 +2846,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6813,19 +6816,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8252,54 +8259,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: failed to launch appliance\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: failed to mkfs.ext2\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "ਬਾਇਨਰੀ '%s' ਬੰਦ ਨਹੀਂ ਹੋਇਆ ਜਾਂ ਚੱਲਣਯੋਗ ਨਹੀਂ ਹੈ\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ਇੱਕ qemu ਸਰੋਤ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਗਦੀ\n"
diff --git a/po/pl.po b/po/pl.po
index 498a81c..7237985 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -98,7 +98,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -293,7 +293,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -303,13 +303,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -330,7 +330,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -367,14 +367,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -686,13 +686,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -788,7 +787,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -800,11 +799,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -824,7 +823,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -852,7 +851,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1049,7 +1048,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1137,7 +1136,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1207,7 +1206,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1221,7 +1220,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1289,7 +1288,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1350,7 +1349,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2140,7 +2139,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2199,7 +2198,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2228,7 +2227,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2327,28 +2326,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2380,11 +2375,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2404,7 +2407,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2451,7 +2454,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2521,7 +2524,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2533,7 +2536,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2846,7 +2849,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6944,19 +6947,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8424,55 +8431,55 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: uruchomienie przyrządu się nie powiodło\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr "libguestfs-test-tool: wykonanie polecenia part-disk się nie powiodło\n"
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 się nie powiodło\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: zamontowanie /dev/sda1 w / się nie powiodło\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
"libguestfs-test-tool: wykonanie polecenia touch na pliku się nie powiodło\n"
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "Plik binarny \"%s\" nie istnieje lub nie jest wykonywalny\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: nie wygląda na katalog źródłowy QEMU\n"
diff --git a/po/ta.po b/po/ta.po
index c4301c9..9f253a5 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6748,19 +6751,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8177,54 +8184,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: failed to launch appliance\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2 தோல்வியுற்றது\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: mount /dev/sda1ல் ஏற முடியவில்லை /\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "Binary '%s' does not exist or is not executable\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ஒரு qemu மூல அடைவு போல் இல்லை\n"
diff --git a/po/te.po b/po/te.po
index 36d0e98..9c94198 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -94,7 +94,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -299,13 +299,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -363,14 +363,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -682,13 +682,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -784,7 +783,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -796,11 +795,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -820,7 +819,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -848,7 +847,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1045,7 +1044,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1133,7 +1132,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1203,7 +1202,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1217,7 +1216,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1285,7 +1284,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1346,7 +1345,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2136,7 +2135,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2195,7 +2194,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2224,7 +2223,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2323,28 +2322,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2376,11 +2371,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2400,7 +2403,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2447,7 +2450,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2517,7 +2520,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2529,7 +2532,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2842,7 +2845,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -6745,19 +6748,23 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8174,54 +8181,54 @@ msgid ""
"Check earlier messages, and the output of the 'printenv' command.\n"
msgstr ""
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr ""
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: ఉపకరణము ఆరంభించుటలో విఫలమైంది\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr ""
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: mkfs.ext2కు విఫలమైంది\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: /dev/sda1ను /పై మౌంట్ చేయుటకు విఫలమైంది\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr ""
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr ""
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
"--qemu/--qemudir options cannot be used.\n"
msgstr ""
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "బెనరీ '%s' లేదు లేదా అది నిర్వర్తించదగునది కాదు\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: అనునది qemu మూలపు డైరెక్టరీవలె కనిపించుటలేదు\n"
diff --git a/po/uk.po b/po/uk.po
index 6e8f084..190d182 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-29 22:41+0100\n"
+"POT-Creation-Date: 2014-09-01 17:38+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/"
@@ -96,7 +96,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:200
+#: ../v2v/v2v.ml:205
msgid "%s: %s (ignored)"
msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
msgid "%s: error: %s"
msgstr ""
-#: ../v2v/v2v.ml:370 ../sysprep/main.ml:297
+#: ../v2v/v2v.ml:385 ../sysprep/main.ml:297
msgid "%s: error: %s\n"
msgstr ""
@@ -301,13 +301,13 @@ msgstr ""
#. ../resize/resize.ml:1309
#. ../builder/builder.ml:743
-#: ../v2v/v2v.ml:363 ../sysprep/main.ml:290 ../sparsify/sparsify.ml:52
+#: ../v2v/v2v.ml:378 ../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:366 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
+#: ../v2v/v2v.ml:381 ../sysprep/main.ml:293 ../sparsify/sparsify.ml:55
msgid "%s: error: %s: %s: %s\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
#. ../resize/resize.ml:1331
#. ../customize/customize_main.ml:262
#. ../builder/builder.ml:764
-#: ../v2v/v2v.ml:388 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
+#: ../v2v/v2v.ml:403 ../sysprep/main.ml:316 ../sparsify/sparsify.ml:74
msgid "%s: exception: %s\n"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
#. ../resize/resize.ml:1319
#. ../builder/builder.ml:752
-#: ../v2v/v2v.ml:376 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
+#: ../v2v/v2v.ml:391 ../sysprep/main.ml:303 ../sparsify/sparsify.ml:62
msgid "%s: failure: %s\n"
msgstr ""
@@ -365,14 +365,14 @@ msgstr ""
#. ../resize/resize.ml:1328
#. ../customize/customize_main.ml:259
#. ../builder/builder.ml:761
-#: ../v2v/v2v.ml:385 ../sysprep/main.ml:313 ../sparsify/sparsify.ml:71
+#: ../v2v/v2v.ml:400 ../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:382 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
+#: ../v2v/v2v.ml:397 ../sysprep/main.ml:309 ../sparsify/sparsify.ml:68
msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
msgstr ""
@@ -380,7 +380,7 @@ msgstr ""
#. ../customize/customize_main.ml:252
#. ../builder/sources.ml:135
#. ../builder/builder.ml:755
-#: ../v2v/v2v.ml:379 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
+#: ../v2v/v2v.ml:394 ../sysprep/main.ml:306 ../sparsify/sparsify.ml:65
msgid "%s: internal error: invalid argument: %s\n"
msgstr ""
@@ -398,7 +398,7 @@ msgstr ""
#. ../resize/resize.ml:1316
#. ../builder/builder.ml:749
-#: ../v2v/v2v.ml:373 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
+#: ../v2v/v2v.ml:388 ../sysprep/main.ml:300 ../sparsify/sparsify.ml:59
msgid "%s: libguestfs error: %s\n"
msgstr ""
@@ -684,13 +684,12 @@ msgstr ""
msgid "-i disk: invalid input filename (%s)"
msgstr ""
-#: ../v2v/cmdline.ml:246
+#: ../v2v/cmdline.ml:244
msgid "-o glance: -oc option cannot be used in this output mode"
msgstr ""
-#: ../v2v/cmdline.ml:244
-msgid ""
-"-o glance: output image name was not specified, use '-os glance_image_name'"
+#: ../v2v/cmdline.ml:246
+msgid "-o glance: -os option cannot be used in this output mode"
msgstr ""
#: ../v2v/output_libvirt.ml:233
@@ -786,7 +785,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:204
+#: ../v2v/v2v.ml:209
msgid "Closing the overlay"
msgstr ""
@@ -798,11 +797,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:173
+#: ../v2v/v2v.ml:178
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:171
+#: ../v2v/v2v.ml:176
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -822,7 +821,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:223
+#: ../v2v/v2v.ml:228
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -850,7 +849,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:258
+#: ../v2v/v2v.ml:273
msgid "Creating output metadata"
msgstr ""
@@ -1047,7 +1046,7 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:294
+#: ../v2v/v2v.ml:309
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1135,7 +1134,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:261 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:276 ../customize/customize_main.ml:237
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1205,7 +1204,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:146
+#: ../v2v/v2v.ml:151
msgid "Initializing the target %s"
msgstr ""
@@ -1219,7 +1218,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:164
+#: ../v2v/v2v.ml:169
msgid "Inspecting the overlay"
msgstr ""
@@ -1287,7 +1286,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:195
+#: ../v2v/v2v.ml:200
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1348,7 +1347,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:116
+#: ../v2v/v2v.ml:121
msgid "Opening the overlay"
msgstr ""
@@ -2138,7 +2137,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:297
+#: ../v2v/v2v.ml:312
msgid "connection closed"
msgstr ""
@@ -2197,7 +2196,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:156
+#: ../v2v/v2v.ml:161
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 "
@@ -2226,7 +2225,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:281
+#: ../v2v/v2v.ml:296
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2325,28 +2324,24 @@ msgstr ""
msgid "fs"
msgstr ""
-#: ../v2v/output_glance.ml:54
+#: ../v2v/output_glance.ml:55
msgid ""
"glance: OpenStack conversion only supports virtual machines with a single "
"disk image. This VM has %d"
msgstr ""
-#: ../v2v/output_glance.ml:108
-msgid "glance: failed to set --min-ram to %Ld (MB) (ignored)"
-msgstr ""
-
-#: ../v2v/output_glance.ml:118
-msgid "glance: failed to set property '%s' to '%s' (ignored)"
+#: ../v2v/output_glance.ml:117
+msgid "glance: failed to set image properties (ignored)"
msgstr ""
-#: ../v2v/output_glance.ml:49
+#: ../v2v/output_glance.ml:50
msgid ""
"glance: glance client is not installed or set up correctly. You may need to "
"set environment variables or source a script to enable authentication. See "
"preceding messages for details."
msgstr ""
-#: ../v2v/output_glance.ml:71
+#: ../v2v/output_glance.ml:72
msgid "glance: image upload to glance failed, see earlier errors"
msgstr ""
@@ -2378,11 +2373,19 @@ msgstr ""
msgid "in the libvirt XML metadata, <os><type arch='...'> is missing or empty"
msgstr ""
+#: ../v2v/v2v.ml:240
+msgid "internal error: qemu corrupted the overlay file"
+msgstr ""
+
+#: ../v2v/v2v.ml:115
+msgid "internal error: qemu-img did not create overlay with backing file"
+msgstr ""
+
#: ../v2v/cmdline.ml:65
msgid "invalid --bridge or --network parameter"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:334
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 "
@@ -2402,7 +2405,7 @@ msgid ""
"[-os %s], or else you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:304
+#: ../v2v/v2v.ml:319
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2449,7 +2452,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../v2v/v2v.ml:274
+#: ../v2v/v2v.ml:289
msgid "no root device found in this operating system image."
msgstr ""
@@ -2519,7 +2522,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:253 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:268 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2531,7 +2534,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:312
+#: ../v2v/v2v.ml:327
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2844,7 +2847,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:187
+#: ../v2v/v2v.ml:192
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -7219,19 +7222,23 @@ msgstr "%s: %s: некоректний параметр розміру «%s» (%
msgid "%s: subprocess failed\n"
msgstr "%s: помилка підпроцесу\n"
-#: p2v/conversion.c:116
+#: p2v/conversion.c:117
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:186
+#: p2v/conversion.c:195
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:198
+#: p2v/conversion.c:207
msgid "Doing conversion ..."
msgstr ""
+#: p2v/conversion.c:292
+msgid "Control connection closed by remote."
+msgstr ""
+
#: p2v/gui.c:109
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
@@ -8881,42 +8888,42 @@ msgstr ""
"Ознайомтеся з попередніми повідомленнями та даними, виведеними командою "
"«printenv».\n"
-#: test-tool/test-tool.c:226
+#: test-tool/test-tool.c:224
#, c-format
msgid "libguestfs-test-tool: failed to add scratch drive\n"
msgstr "libguestfs-test-tool: не вдалося додати фальшивий диск\n"
-#: test-tool/test-tool.c:276
+#: test-tool/test-tool.c:274
#, c-format
msgid "libguestfs-test-tool: failed to launch appliance\n"
msgstr "libguestfs-test-tool: не вдалося запустити пристрій\n"
-#: test-tool/test-tool.c:288
+#: test-tool/test-tool.c:286
#, c-format
msgid "libguestfs-test-tool: failed to run part-disk\n"
msgstr "libguestfs-test-tool: не вдалося запустити part-disk\n"
-#: test-tool/test-tool.c:294
+#: test-tool/test-tool.c:292
#, c-format
msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
msgstr "libguestfs-test-tool: не вдалося виконати mkfs.ext2\n"
-#: test-tool/test-tool.c:300
+#: test-tool/test-tool.c:298
#, c-format
msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
msgstr "libguestfs-test-tool: не вдалося змонтувати /dev/sda1 до /\n"
-#: test-tool/test-tool.c:307
+#: test-tool/test-tool.c:305
#, c-format
msgid "libguestfs-test-tool: failed to touch file\n"
msgstr "libguestfs-test-tool: не вдалося виконати touch для файла\n"
-#: test-tool/test-tool.c:313
+#: test-tool/test-tool.c:311
#, c-format
msgid "libguestfs-test-tool: shutdown failed\n"
msgstr "libguestfs-test-tool: спроба завершення роботи зазнала невдачі\n"
-#: test-tool/test-tool.c:347
+#: test-tool/test-tool.c:345
#, c-format
msgid ""
"LIBGUESTFS_HV/LIBGUESTFS_QEMU environment variable is already set, so\n"
@@ -8926,12 +8933,12 @@ msgstr ""
"встановлено, отже\n"
"не можна використовувати параметри --qemu/--qemudir.\n"
-#: test-tool/test-tool.c:355
+#: test-tool/test-tool.c:353
#, c-format
msgid "Binary '%s' does not exist or is not executable\n"
msgstr "Виконуваного файла «%s» не існує або вказаний файл не є виконуваним\n"
-#: test-tool/test-tool.c:372
+#: test-tool/test-tool.c:370
#, c-format
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: не є каталогом початкових кодів qemu\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list