[Pkg-libvirt-commits] [libguestfs] 45/146: Version 1.28.4.
Hilko Bengen
bengen at moszumanska.debian.org
Sun Mar 29 17:00:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository libguestfs.
commit 799b73a6da5365f3524e9cf122d98336e8202998
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sun Nov 30 19:24:26 2014 +0000
Version 1.28.4.
---
BUGS | 111 ++++++++++++--
configure.ac | 2 +-
po-docs/ja.po | 341 ++++++++++++++++++++++++--------------------
po-docs/libguestfs-docs.pot | 319 +++++++++++++++++++++--------------------
po-docs/uk.po | 331 +++++++++++++++++++++---------------------
po/en_GB.po | 265 ++++++++++++++++++----------------
po/es.po | 265 ++++++++++++++++++----------------
po/gu.po | 265 ++++++++++++++++++----------------
po/hi.po | 265 ++++++++++++++++++----------------
po/kn.po | 265 ++++++++++++++++++----------------
po/libguestfs.pot | 267 ++++++++++++++++++----------------
po/ml.po | 265 ++++++++++++++++++----------------
po/mr.po | 265 ++++++++++++++++++----------------
po/nl.po | 275 +++++++++++++++++++----------------
po/or.po | 265 ++++++++++++++++++----------------
po/pa.po | 265 ++++++++++++++++++----------------
po/pl.po | 275 +++++++++++++++++++----------------
po/ta.po | 265 ++++++++++++++++++----------------
po/te.po | 265 ++++++++++++++++++----------------
po/uk.po | 311 ++++++++++++++++++++++------------------
20 files changed, 2794 insertions(+), 2353 deletions(-)
diff --git a/BUGS b/BUGS
index 5d33759..310fd9c 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-11-15
+Last updated: 2014-11-30
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -398,9 +398,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1150858 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150858
virt-sparsify: unknown option `--check-tmpdir=ignore'
-1151725 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151725
- virt-v2v: warning: /files/boot/grub/device.map/hd0 references unknown device "sda" when convert a guest with ide bus
-
1151739 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151739
typo error in man page of virt-edit
@@ -467,6 +464,57 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1161019 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1161019
Remove rhev related files(rhsrvany.exe and rhev-apt.exe) after conversion of windows guests to kvm
+1164708 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164708
+ set-label can only set <=127 bytes for btrfs and <=126 bytes for ntfs filesystem which not meet the help message. Also for ntfs it should give a warning message when the length >128 bytes
+
+1164729 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164729
+ set-label can only set <=63 bytes for btrfs and ntfs filesystem which not meet the help message. Also for btrfs and ntfs it should give a warning message when the length exceed the limited length
+
+1164734 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164734
+ The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+1164765 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164765
+ [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1164766 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1164766
+ [RFE] Add a new API to scan devices for a btrfs filesystem
+
+1166057 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1166057
+ btrfs filesystem will not work well if you create the filesystem with multiple disks at the same time, such as: mkfs-btrfs "/dev/sda1 /dev/sdb1"
+
+1167601 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167601
+ "Conversion was successful" pop out even virt-p2v fails
+
+1167623 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167623
+ Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v
+
+1167916 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167916
+ P2V error:unexpected end of file waiting for password prompt.
+
+1167921 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167921
+ p2v: No Network Connection dialog
+
+1167922 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167922
+ p2v: No virtual console
+
+1168144 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168144
+ warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server
+
+1168626 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168626
+ Tracker: Build RHEL 7.1 - based virt-p2v ISO
+
+1168632 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168632
+ Fix kickstart for virt-p2v
+
+1168751 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168751
+ broken lvm-set-filter API with newer lvm2
+
+1168865 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168865
+ warning: /files/boot/grub/device.map/hd0 references unknown device "vda" when convert a local guest with virtio disk to openstack server (-i disk))
+
+1169015 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1169015
+ virt-resize --expand fails on ubuntu-14.04.img image (regression)
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -497,7 +545,10 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1156298 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1156298
Remove files in package libguestfs-bash-completion, these files are bash completion files, some of the virt tool completion are already implement in another file, so can remove its completion file
-(159 bugs)
+1167774 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1167774
+ virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+
+(176 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -509,9 +560,6 @@ You can help by testing the fixes.
1122557 POST https://bugzilla.redhat.com/show_bug.cgi?id=1122557
virt-sparsify overwrites block devices if used as output files
-1151738 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151738
- typo error in man page of virt-edit
-
1159651 POST https://bugzilla.redhat.com/show_bug.cgi?id=1159651
virt-sysprep firstboot script is not deleted if it reboot a RHEL 7 guest
@@ -524,9 +572,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
-1100528 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1100528
- These APIs also need to add to `guestfish -h` command list
-
1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
qemu-img shows error message for backing file twice
@@ -536,8 +581,14 @@ You can help by testing the fixes.
1149640 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1149640
hardcoded el7 disttag in BR makes build fail on ppc64le
-1162966 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1162966
- xfs should also give a warning out to let customer know the limitation
+1165564 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165564
+ Provide Reboot/Shutdown button after virt-p2v
+
+1165569 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165569
+ Disable "cancel conversion" button after virt-p2v conversion finished
+
+1166618 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1166618
+ virt-resize should give out the detail warning info to let customers know what's going wrong
(12 bugs)
@@ -571,6 +622,9 @@ These bugs are in the VERIFIED state.
1099284 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099284
typo errors in man pages
+1100528 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1100528
+ These APIs also need to add to `guestfish -h` command list
+
1113020 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1113020
Support virt-sparsify option to allow specifying temporary file or block device
@@ -632,7 +686,7 @@ These bugs are in the VERIFIED state.
virt-v2v: error: disk sda has no defined format shows when converting xen hvm guest
1142004 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142004
- virt-v2v prints waring:WARNING:/files/boot/grub/device.map references unknown device "xvda"
+ virt-v2v prints warning:WARNING:/files/boot/grub/device.map references unknown device "xvda"
1142008 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1142008
Conversion guest cannot been seen on rhevm server
@@ -709,6 +763,12 @@ These bugs are in the VERIFIED state.
1151033 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151033
virt-v2v conversions from VMware vCenter server run slowly
+1151725 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151725
+ virt-v2v: warning: /files/boot/grub/device.map/hd0 references unknown device "sda" when convert a guest with ide bus
+
+1151738 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151738
+ typo error in man page of virt-edit
+
1151766 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151766
libguestfs-bash-completion package contains file /usr/share/bash-completion/completions/virt-log, but no _virt_log() function in that file
@@ -760,6 +820,27 @@ These bugs are in the VERIFIED state.
1161575 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1161575
Failed to import guest with "rtl8139" nic to openstack server after converted by v2v
-(72 bugs)
+1162966 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1162966
+ xfs should also give a warning out to let customer know the limitation
+
+1164619 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164619
+ Inspect-get-icon failed on RHEL7 guest
+
+1164697 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164697
+ typo errors in man pages
+
+1164732 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164732
+ The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+
+1164853 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164853
+ Booting in qemu found no volume groups and failed checking the filesystems
+
+1165975 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165975
+ File "/boot/grub2/device.map" showing is not right after converting a rhel7 guest from esx server
+
+1167302 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167302
+ virt-v2v: warning: ova hard disk has no parent controller when convert from a ova file
+
+(82 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 91b0552..84875cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [28])
-m4_define([libguestfs_release], [3])
+m4_define([libguestfs_release], [4])
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 531a041..cbf1fcd 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:01+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -395,7 +395,7 @@ msgstr ""
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
#: ../p2v/virt-p2v-make-disk.pod:49 ../p2v/virt-p2v-make-kickstart.pod:133
-#: ../p2v/virt-p2v.pod:433 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:435 ../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
@@ -415,7 +415,7 @@ msgstr "オプション"
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
#: ../p2v/virt-p2v-make-disk.pod:53 ../p2v/virt-p2v-make-kickstart.pod:137
-#: ../p2v/virt-p2v.pod:437 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:439 ../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
@@ -779,7 +779,7 @@ msgstr ""
#: ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203
#: ../fish/guestfish.pod:419 ../format/virt-format.pod:153
#: ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:122
-#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:446
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
#: ../v2v/virt-v2v.pod:613
@@ -794,7 +794,7 @@ msgstr "B<-v>"
#: ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205
#: ../fish/guestfish.pod:421 ../format/virt-format.pod:155
#: ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:124
-#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:448
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
#: ../v2v/virt-v2v.pod:615
@@ -825,7 +825,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:203
#: ../p2v/virt-p2v-make-disk.pod:64 ../p2v/virt-p2v-make-kickstart.pod:152
-#: ../p2v/virt-p2v.pod:452 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
#: ../v2v/virt-v2v.pod:619
@@ -844,7 +844,7 @@ msgstr "B<-V>"
#: ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:130 ../make-fs/virt-make-fs.pod:205
#: ../p2v/virt-p2v-make-disk.pod:66 ../p2v/virt-p2v-make-kickstart.pod:154
-#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:456 ../rescue/virt-rescue.pod:246
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
@@ -860,7 +860,7 @@ msgstr "B<--version>"
#: ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213
#: ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132
#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68
-#: ../p2v/virt-p2v-make-kickstart.pod:156 ../p2v/virt-p2v.pod:456
+#: ../p2v/virt-p2v-make-kickstart.pod:156 ../p2v/virt-p2v.pod:458
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
@@ -1482,7 +1482,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:498 ../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/virt-p2v-make-disk.pod:103
-#: ../p2v/virt-p2v-make-kickstart.pod:187 ../p2v/virt-p2v.pod:582
+#: ../p2v/virt-p2v-make-kickstart.pod:187 ../p2v/virt-p2v.pod:584
#: ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:755 ../ruby/examples/guestfs-ruby.pod:34
@@ -1525,7 +1525,7 @@ msgstr "著者"
#: ../edit/virt-edit.pod:402 ../format/virt-format.pod:197
#: ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231
#: ../p2v/virt-p2v-make-disk.pod:112 ../p2v/virt-p2v-make-kickstart.pod:198
-#: ../p2v/virt-p2v.pod:593 ../rescue/virt-rescue.pod:424
+#: ../p2v/virt-p2v.pod:597 ../rescue/virt-rescue.pod:424
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
@@ -1553,7 +1553,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:521 ../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/virt-p2v-make-disk.pod:114
-#: ../p2v/virt-p2v-make-kickstart.pod:200 ../p2v/virt-p2v.pod:597
+#: ../p2v/virt-p2v-make-kickstart.pod:200 ../p2v/virt-p2v.pod:601
#: ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:52
@@ -1925,7 +1925,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../p2v/virt-p2v-make-disk.pod:110 ../p2v/virt-p2v-make-kickstart.pod:196
-#: ../p2v/virt-p2v.pod:591 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:595 ../perl/examples/guestfs-perl.pod:53
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4857
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
@@ -1957,7 +1957,7 @@ 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:3522 ../p2v/virt-p2v-make-disk.pod:116
-#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:599
+#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:603
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4863
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
#: ../v2v/virt-v2v.pod:1456
@@ -2412,7 +2412,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:139
-#: ../p2v/virt-p2v.pod:439 ../resize/virt-resize.pod:272
+#: ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272
#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:239
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -7884,7 +7884,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:1071 ../guestfs-release-notes.pod:1075
#: ../guestfs-release-notes.pod:1420 ../guestfs-release-notes.pod:1424
#: ../guestfs-release-notes.pod:1976 ../guestfs-release-notes.pod:1980
-#: ../p2v/virt-p2v.pod:423 ../p2v/virt-p2v.pod:429
+#: ../p2v/virt-p2v.pod:425 ../p2v/virt-p2v.pod:431
#: ../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
@@ -17275,7 +17275,7 @@ msgstr ""
#. type: =item
#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5056
-#: ../p2v/virt-p2v.pod:497 ../src/guestfs-actions.pod:361
+#: ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361
#: ../src/guestfs-actions.pod:8060
msgid "C<name>"
msgstr "C<name>"
@@ -19129,9 +19129,13 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:1053 ../src/guestfs-actions.pod:1547
+#, fuzzy
+#| msgid ""
+#| "Create a btrfs subvolume. The C<dest> argument is the destination "
+#| "directory and the name of the snapshot, in the form C</path/to/dest/name>."
msgid ""
"Create a btrfs subvolume. The C<dest> argument is the destination directory "
-"and the name of the snapshot, in the form C</path/to/dest/name>."
+"and the name of the subvolume, in the form C</path/to/dest/name>."
msgstr ""
"btrfs サブツリーを作成します。The C<dest> 引数は、C</path/to/dest/name> 形式"
"となる、スナップショットの宛先ディレクトリーおよび名前です。"
@@ -19153,7 +19157,9 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:1060 ../src/guestfs-actions.pod:1560
-msgid "Delete the named btrfs subvolume."
+#, fuzzy
+#| msgid "Delete the named btrfs subvolume."
+msgid "Delete the named btrfs subvolume or snapshot."
msgstr "名前付き btrfs サブボリュームを削除します。"
#. type: =head2
@@ -21940,10 +21946,16 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
+#, fuzzy
+#| msgid ""
+#| "This function is used to add additional options to the guest kernel "
+#| "command line."
msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
msgstr ""
+"この関数は、追加のオプションを仮想マシンのカーネルコマンドラインに追加するた"
+"めに使用されます。"
#. type: textblock
#: ../fish/guestfish-actions.pod:2339 ../src/guestfs-actions.pod:3716
@@ -31745,9 +31757,13 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
+#, fuzzy
+#| msgid ""
+#| "This function is used to add additional options to the guest kernel "
+#| "command line."
msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
msgstr ""
"この関数は、追加のオプションを仮想マシンのカーネルコマンドラインに追加するた"
"めに使用されます。"
@@ -43173,7 +43189,7 @@ msgstr ""
#. type: textblock
#: ../guestfs-release-notes.pod:341
msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
"unknown device \"xvda\""
msgstr ""
@@ -52946,20 +52962,22 @@ msgstr ""
#: ../p2v/virt-p2v.pod:54
msgid ""
"The reverse port forwarding feature of ssh (ie. C<ssh -R>) is required by "
-"virt-p2v, and it will not work if this is disabled on the conversion server."
+"virt-p2v, and it will not work if this is disabled on the conversion "
+"server. (C<AllowTcpForwarding> must be C<yes> in the L<sshd_config(5)> file "
+"on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:58
+#: ../p2v/virt-p2v.pod:59
msgid ""
"The conversion server does not need to be a physical machine. It could be a "
"virtual machine, as long as it has sufficient memory and disk space to do "
"the conversion, and as long as the physical machine can connect directly to "
-"its SSH port."
+"its SSH port. (See also L<virt-v2v(1)/RESOURCE REQUIREMENTS>)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:63
+#: ../p2v/virt-p2v.pod:65
msgid ""
"Because all of the data on the physical server's hard drive(s) has to be "
"copied over the network, the speed of conversion is largely determined by "
@@ -52967,12 +52985,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:67
+#: ../p2v/virt-p2v.pod:69
msgid "GUI INTERACTIVE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:69
+#: ../p2v/virt-p2v.pod:71
msgid ""
"When you start virt-p2v, you'll see a graphical configuration dialog that "
"walks you through connection to the conversion server, asks for the "
@@ -52981,17 +52999,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:75
+#: ../p2v/virt-p2v.pod:77
msgid "SSH CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:77
+#: ../p2v/virt-p2v.pod:79
msgid "When virt-p2v starts up in GUI mode, the first dialog looks like this:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:79
+#: ../p2v/virt-p2v.pod:81
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -53009,7 +53027,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:91
+#: ../p2v/virt-p2v.pod:93
msgid ""
"In the fields above, you must enter the hostname, SSH port number, remote "
"user name and password of the conversion server. The conversion server must "
@@ -53017,14 +53035,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:95
+#: ../p2v/virt-p2v.pod:97
msgid ""
"Normally you must log in to the conversion server as root, but if you check "
"the following box:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:98
+#: ../p2v/virt-p2v.pod:100
#, no-wrap
msgid ""
" │ │\n"
@@ -53034,7 +53052,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:102
+#: ../p2v/virt-p2v.pod:104
msgid ""
"then you can log in as another user, and virt-p2v will use the L<sudo(8)> "
"command to elevate privileges to root. Note that sudo must not require a "
@@ -53042,7 +53060,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:106
+#: ../p2v/virt-p2v.pod:108
msgid ""
"It is also possible to run virt-v2v on the conversion server entirely as non-"
"root, but output modes may be limited. Consult the L<virt-v2v(1)> manual "
@@ -53050,12 +53068,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:110
+#: ../p2v/virt-p2v.pod:112
msgid "At the bottom of the dialog are these buttons:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:112
+#: ../p2v/virt-p2v.pod:114
#, no-wrap
msgid ""
" │ │\n"
@@ -53068,7 +53086,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:119
+#: ../p2v/virt-p2v.pod:121
msgid ""
"You must press the C<Test connection> button first to test the SSH "
"connection to the conversion server. If that is successful (ie. you have "
@@ -53078,19 +53096,19 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:125
+#: ../p2v/virt-p2v.pod:127
msgid "DISK AND NETWORK CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:127
+#: ../p2v/virt-p2v.pod:129
msgid ""
"The second configuration dialog lets you configure the details of "
"conversion, including what to convert and where to send the guest."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:130
+#: ../p2v/virt-p2v.pod:132
msgid ""
"In the left hand column, starting at the top, the target properties let you "
"select the name of the guest (ie. after conversion) and how many virtual "
@@ -53099,7 +53117,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:135
+#: ../p2v/virt-p2v.pod:137
#, no-wrap
msgid ""
" ┌─────────────────────────────────────── ─ ─ ─ ─\n"
@@ -53115,7 +53133,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:145
+#: ../p2v/virt-p2v.pod:147
msgid ""
"The second panel on the left controls the virt-v2v output options. To "
"understand these options it is a really good idea to read the L<virt-v2v(1)> "
@@ -53125,7 +53143,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:152
+#: ../p2v/virt-p2v.pod:154
#, no-wrap
msgid ""
" │\n"
@@ -53145,14 +53163,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:166
+#: ../p2v/virt-p2v.pod:168
msgid ""
"All output options and paths are relative to the conversion server (I<not> "
"to the physical server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:169
+#: ../p2v/virt-p2v.pod:171
msgid ""
"The final option in this panel enables server-side debugging. This produces "
"a lot of output, but is essential if you are tracking down virt-p2v or virt-"
@@ -53160,7 +53178,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:173
+#: ../p2v/virt-p2v.pod:175
#, no-wrap
msgid ""
" │\n"
@@ -53170,7 +53188,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:177
+#: ../p2v/virt-p2v.pod:179
msgid ""
"Finally in the left hand column is an information box giving the version of "
"virt-p2v (on the physical server) and virt-v2v (on the conversion server). "
@@ -53178,7 +53196,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:182
+#: ../p2v/virt-p2v.pod:184
msgid ""
"In the right hand column are three panels which control what hard disks, "
"removable media devices, and network interfaces, will be created in the "
@@ -53186,7 +53204,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:187
+#: ../p2v/virt-p2v.pod:189
#, no-wrap
msgid ""
" ─ ─ ───────────────────────────────────────┐\n"
@@ -53200,7 +53218,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:197
msgid ""
"Normally you would want to convert all hard disks. If you want virt-p2v to "
"completely ignore a local hard disk, uncheck it. The hard disk that "
@@ -53210,7 +53228,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:201
+#: ../p2v/virt-p2v.pod:203
#, no-wrap
msgid ""
" │\n"
@@ -53223,7 +53241,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:208
+#: ../p2v/virt-p2v.pod:210
msgid ""
"If the physical machine has CD or DVD drives, then you can use the Removable "
"media panel to create corresponding drives on the guest after conversion. "
@@ -53232,7 +53250,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:213
+#: ../p2v/virt-p2v.pod:215
#, no-wrap
msgid ""
" │\n"
@@ -53246,7 +53264,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:221
+#: ../p2v/virt-p2v.pod:223
msgid ""
"In the Network interfaces panel, select the network interfaces that should "
"be created in the guest after conversion. You can also connect these to "
@@ -53255,14 +53273,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:226
+#: ../p2v/virt-p2v.pod:228
msgid ""
"When you are ready to begin the conversion, press the C<Start conversion> "
"button:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:229
+#: ../p2v/virt-p2v.pod:231
#, no-wrap
msgid ""
" │\n"
@@ -53273,17 +53291,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:234
+#: ../p2v/virt-p2v.pod:236
msgid "CONVERSION RUNNING DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:236
+#: ../p2v/virt-p2v.pod:238
msgid "When conversion is running you will see this dialog:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:238
+#: ../p2v/virt-p2v.pod:240
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -53310,14 +53328,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:259
+#: ../p2v/virt-p2v.pod:261
msgid ""
"In the main scrolling area you will see log messages from the virt-v2v "
"process."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:262
+#: ../p2v/virt-p2v.pod:264
msgid ""
"Below the main area, virt-p2v shows you the location of the directory on the "
"conversion server that contains log files and other debugging information. "
@@ -53325,19 +53343,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:267
+#: ../p2v/virt-p2v.pod:269
msgid ""
"Once conversion has finished, you should shut down the physical machine. If "
"conversion is successful, you should never reboot it."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:270
+#: ../p2v/virt-p2v.pod:272
msgid "KERNEL COMMAND LINE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:272
+#: ../p2v/virt-p2v.pod:274
msgid ""
"If you don't want to configure things using the graphical UI, an alternative "
"is to configure through the kernel command line. This is especially "
@@ -53346,7 +53364,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:277
+#: ../p2v/virt-p2v.pod:279
msgid ""
"Where exactly you set command line arguments depends on your PXE "
"implementation, but for pxelinux you put them in the C<APPEND> field in the "
@@ -53354,7 +53372,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:281
+#: ../p2v/virt-p2v.pod:283
#, no-wrap
msgid ""
" DEFAULT p2v\n"
@@ -53367,22 +53385,22 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:288
+#: ../p2v/virt-p2v.pod:290
msgid "You have to set some or all of the following command line arguments:"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:292
+#: ../p2v/virt-p2v.pod:294
msgid "B<p2v.server=SERVER>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:294
+#: ../p2v/virt-p2v.pod:296
msgid "The name or IP address of the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:296
+#: ../p2v/virt-p2v.pod:298
msgid ""
"This is always required if you are using the kernel configuration method. "
"If virt-p2v does not find this on the kernel command line then it switches "
@@ -53390,58 +53408,58 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:300
+#: ../p2v/virt-p2v.pod:302
msgid "B<p2v.port=NN>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:302
+#: ../p2v/virt-p2v.pod:304
msgid "The SSH port number on the conversion server (default: C<22>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:304
+#: ../p2v/virt-p2v.pod:306
msgid "B<p2v.username=USERNAME>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:306
+#: ../p2v/virt-p2v.pod:308
msgid ""
"The SSH username that we log in as on the conversion server (default: "
"C<root>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:309
+#: ../p2v/virt-p2v.pod:311
msgid "B<p2v.password=PASSWORD>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:311
+#: ../p2v/virt-p2v.pod:313
msgid "The SSH password that we use to log in to the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:313
+#: ../p2v/virt-p2v.pod:315
msgid ""
"The default is to try with no password. If this fails then virt-p2v will "
"ask the user to type the password (probably several times during conversion)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:317
+#: ../p2v/virt-p2v.pod:319
msgid ""
"Note that virt-p2v does not support authentication using key distribution at "
"this time."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:320
+#: ../p2v/virt-p2v.pod:322
msgid "B<p2v.sudo>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:322
+#: ../p2v/virt-p2v.pod:324
msgid ""
"Use C<p2v.sudo> to tell virt-p2v to use L<sudo(8)> to gain root privileges "
"on the conversion server after logging in as a non-root user (default: do "
@@ -53449,12 +53467,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:326
+#: ../p2v/virt-p2v.pod:328
msgid "B<p2v.name=GUESTNAME>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:328
+#: ../p2v/virt-p2v.pod:330
msgid ""
"The name of the guest that is created. The default is to try to derive a "
"name from the physical machine's hostname (if possible) else use a randomly "
@@ -53462,24 +53480,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:332
+#: ../p2v/virt-p2v.pod:334
msgid "B<p2v.vcpus=NN>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:334
+#: ../p2v/virt-p2v.pod:336
msgid ""
"The number of virtual CPUs to give to the guest. The default is to use the "
"same as the number of physical CPUs."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:337
+#: ../p2v/virt-p2v.pod:339
msgid "B<p2v.memory=NN(M|G)>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:339
+#: ../p2v/virt-p2v.pod:341
msgid ""
"The size of the guest memory. You can specify this in megabytes or "
"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
@@ -53487,17 +53505,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:343
+#: ../p2v/virt-p2v.pod:345
msgid "B<p2v.debug>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:345
+#: ../p2v/virt-p2v.pod:347
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:349
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -53505,17 +53523,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:351
+#: ../p2v/virt-p2v.pod:353
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:355
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:357
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -53523,17 +53541,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:359
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:361
msgid "B<p2v.removable=srX,srY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:363
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -53541,24 +53559,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:365
+#: ../p2v/virt-p2v.pod:367
msgid "B<p2v.interfaces=em1,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:369
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:370
+#: ../p2v/virt-p2v.pod:372
msgid "B<p2v.network=interface:target,...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:374
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -53566,14 +53584,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:376
+#: ../p2v/virt-p2v.pod:378
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:379
+#: ../p2v/virt-p2v.pod:381
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -53581,12 +53599,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:383
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:385
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -53594,136 +53612,136 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:387
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:388
+#: ../p2v/virt-p2v.pod:390
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:392
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:393
+#: ../p2v/virt-p2v.pod:395
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:396
+#: ../p2v/virt-p2v.pod:398
msgid "B<p2v.oa=sparse|preallocated>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:400
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:401
+#: ../p2v/virt-p2v.pod:403
msgid "B<p2v.oc=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:405
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v I<-"
"oc> option. See L<virt-v2v(1)/OPTIONS> and L<http://libvirt.org/uri.html>"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:407
+#: ../p2v/virt-p2v.pod:409
msgid "B<p2v.of=raw|qcow2|...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:411
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:412
+#: ../p2v/virt-p2v.pod:414
msgid "B<p2v.os=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:416
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:417
+#: ../p2v/virt-p2v.pod:419
msgid ""
"If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:421
msgid "B<ip=dhcp>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:423
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:425
+#: ../p2v/virt-p2v.pod:427
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:429
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:441
+#: ../p2v/virt-p2v.pod:443
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:445
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:450
+#: ../p2v/virt-p2v.pod:452
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:460
+#: ../p2v/virt-p2v.pod:462
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:464
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:465
+#: ../p2v/virt-p2v.pod:467
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -53735,7 +53753,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:473
+#: ../p2v/virt-p2v.pod:475
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -53743,7 +53761,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:477
+#: ../p2v/virt-p2v.pod:479
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53755,7 +53773,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:483
+#: ../p2v/virt-p2v.pod:485
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -53764,7 +53782,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:488
+#: ../p2v/virt-p2v.pod:490
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -53772,40 +53790,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:492
msgid ""
"where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:493
+#: ../p2v/virt-p2v.pod:495
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:499 ../p2v/virt-p2v.pod:505 ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
msgid "I<before conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:501
+#: ../p2v/virt-p2v.pod:503
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:505
msgid "C<physical.xml>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:507
+#: ../p2v/virt-p2v.pod:509
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:511
+#: ../p2v/virt-p2v.pod:513
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -53813,44 +53831,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:515
+#: ../p2v/virt-p2v.pod:517
msgid "C<status>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:519
msgid "I<after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:521
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:522
+#: ../p2v/virt-p2v.pod:524
msgid "C<time>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:528
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:530
msgid "C<virt-v2v-conversion-log.txt>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:532
msgid "I<during/after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:534
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -53859,7 +53877,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:539
+#: ../p2v/virt-p2v.pod:541
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -53870,7 +53888,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:546
+#: ../p2v/virt-p2v.pod:548
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53888,7 +53906,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:558
+#: ../p2v/virt-p2v.pod:560
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -53901,7 +53919,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:567
+#: ../p2v/virt-p2v.pod:569
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -53910,7 +53928,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:573
+#: ../p2v/virt-p2v.pod:575
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -53919,7 +53937,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:578
+#: ../p2v/virt-p2v.pod:580
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -53927,14 +53945,23 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:584
+#: ../p2v/virt-p2v.pod:586
+#, fuzzy
+#| msgid ""
+#| "L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
+#| "L<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, L<http://"
+#| "libguestfs.org/>."
msgid ""
"L<virt-p2v-make-disk(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, "
-"L<qemu-nbd(1)>, L<ssh(1)>, L<http://libguestfs.org/>."
+"L<qemu-nbd(1)>, L<ssh(1)>, L<sshd(8)>, L<sshd_config(5)>, L<http://"
+"libguestfs.org/>."
msgstr ""
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
+"L<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, L<http://libguestfs."
+"org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:595 ../v2v/virt-v2v.pod:1446
+#: ../p2v/virt-p2v.pod:599 ../v2v/virt-v2v.pod:1446
msgid "Matthew Booth"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index faff765..3f69f57 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.28.3\n"
+"Project-Id-Version: libguestfs 1.28.4\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\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:176 ../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:176 ../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:180 ../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:180 ../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 ""
@@ -458,12 +458,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:490 ../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:197 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:446 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:490 ../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:197 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:492 ../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:199 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:448 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:492 ../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:199 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450 ../res [...]
msgid "B<--verbose>"
msgstr ""
@@ -473,17 +473,17 @@ 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:499 ../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:203 ../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:499 ../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:203 ../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:501 ../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:205 ../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:501 ../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:205 ../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:503 ../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:207 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68 ../p2v/virt-p2v-make-kickstart.pod:156 [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:503 ../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:207 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68 ../p2v/virt-p2v-make-kickstart.pod:156 [...]
msgid "Display version number and exit."
msgstr ""
@@ -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:1690 ../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:248 ../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:1690 ../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:248 ../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:1711 ../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:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1711 ../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:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1713 ../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:262 ../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:1713 ../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:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
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:1272 ../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:1272 ../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:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:599 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4863 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:680 ../fish/guestfish.pod:1642 ../fuse/guestmount.pod:435 ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:603 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4863 ../test-tool/libguestfs-test-tool.pod [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1595,7 +1595,7 @@ msgid "You can combine these options, and have multiple options of all types."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:139 ../p2v/virt-p2v.pod:439 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:239
+#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:139 ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:239
msgid "Display help."
msgstr ""
@@ -6677,7 +6677,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:9 ../guestfs-release-notes.pod:11 ../guestfs-release-notes.pod:18 ../guestfs-release-no [...]
+#: ../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:9 ../guestfs-release-notes.pod:11 ../guestfs-release-notes.pod:18 ../guestfs-release-no [...]
msgid "comment"
msgstr ""
@@ -15152,7 +15152,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5056 ../p2v/virt-p2v.pod:497 ../src/guestfs-actions.pod:361 ../src/guestfs-actions.pod:8060
+#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5056 ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361 ../src/guestfs-actions.pod:8060
msgid "C<name>"
msgstr ""
@@ -16856,7 +16856,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:1053 ../src/guestfs-actions.pod:1547
msgid ""
"Create a btrfs subvolume. The C<dest> argument is the destination directory "
-"and the name of the snapshot, in the form C</path/to/dest/name>."
+"and the name of the subvolume, in the form C</path/to/dest/name>."
msgstr ""
#. type: =head2
@@ -16874,7 +16874,7 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:1060 ../src/guestfs-actions.pod:1560
-msgid "Delete the named btrfs subvolume."
+msgid "Delete the named btrfs subvolume or snapshot."
msgstr ""
#. type: =head2
@@ -19425,8 +19425,8 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
msgstr ""
#. type: textblock
@@ -28495,8 +28495,8 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
msgstr ""
#. type: textblock
@@ -39024,7 +39024,7 @@ msgstr ""
#. type: textblock
#: ../guestfs-release-notes.pod:341
msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
"unknown device \"xvda\""
msgstr ""
@@ -48585,20 +48585,22 @@ msgstr ""
#: ../p2v/virt-p2v.pod:54
msgid ""
"The reverse port forwarding feature of ssh (ie. C<ssh -R>) is required by "
-"virt-p2v, and it will not work if this is disabled on the conversion server."
+"virt-p2v, and it will not work if this is disabled on the conversion "
+"server. (C<AllowTcpForwarding> must be C<yes> in the L<sshd_config(5)> file "
+"on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:58
+#: ../p2v/virt-p2v.pod:59
msgid ""
"The conversion server does not need to be a physical machine. It could be a "
"virtual machine, as long as it has sufficient memory and disk space to do "
"the conversion, and as long as the physical machine can connect directly to "
-"its SSH port."
+"its SSH port. (See also L<virt-v2v(1)/RESOURCE REQUIREMENTS>)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:63
+#: ../p2v/virt-p2v.pod:65
msgid ""
"Because all of the data on the physical server's hard drive(s) has to be "
"copied over the network, the speed of conversion is largely determined by "
@@ -48606,12 +48608,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:67
+#: ../p2v/virt-p2v.pod:69
msgid "GUI INTERACTIVE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:69
+#: ../p2v/virt-p2v.pod:71
msgid ""
"When you start virt-p2v, you'll see a graphical configuration dialog that "
"walks you through connection to the conversion server, asks for the "
@@ -48620,17 +48622,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:75
+#: ../p2v/virt-p2v.pod:77
msgid "SSH CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:77
+#: ../p2v/virt-p2v.pod:79
msgid "When virt-p2v starts up in GUI mode, the first dialog looks like this:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:79
+#: ../p2v/virt-p2v.pod:81
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -48648,7 +48650,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:91
+#: ../p2v/virt-p2v.pod:93
msgid ""
"In the fields above, you must enter the hostname, SSH port number, remote "
"user name and password of the conversion server. The conversion server must "
@@ -48656,14 +48658,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:95
+#: ../p2v/virt-p2v.pod:97
msgid ""
"Normally you must log in to the conversion server as root, but if you check "
"the following box:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:98
+#: ../p2v/virt-p2v.pod:100
#, no-wrap
msgid ""
" │ │\n"
@@ -48673,7 +48675,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:102
+#: ../p2v/virt-p2v.pod:104
msgid ""
"then you can log in as another user, and virt-p2v will use the L<sudo(8)> "
"command to elevate privileges to root. Note that sudo must not require a "
@@ -48681,7 +48683,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:106
+#: ../p2v/virt-p2v.pod:108
msgid ""
"It is also possible to run virt-v2v on the conversion server entirely as "
"non-root, but output modes may be limited. Consult the L<virt-v2v(1)> "
@@ -48689,12 +48691,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:110
+#: ../p2v/virt-p2v.pod:112
msgid "At the bottom of the dialog are these buttons:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:112
+#: ../p2v/virt-p2v.pod:114
#, no-wrap
msgid ""
" │ │\n"
@@ -48707,7 +48709,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:119
+#: ../p2v/virt-p2v.pod:121
msgid ""
"You must press the C<Test connection> button first to test the SSH "
"connection to the conversion server. If that is successful (ie. you have "
@@ -48717,19 +48719,19 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:125
+#: ../p2v/virt-p2v.pod:127
msgid "DISK AND NETWORK CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:127
+#: ../p2v/virt-p2v.pod:129
msgid ""
"The second configuration dialog lets you configure the details of "
"conversion, including what to convert and where to send the guest."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:130
+#: ../p2v/virt-p2v.pod:132
msgid ""
"In the left hand column, starting at the top, the target properties let you "
"select the name of the guest (ie. after conversion) and how many virtual "
@@ -48738,7 +48740,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:135
+#: ../p2v/virt-p2v.pod:137
#, no-wrap
msgid ""
" ┌─────────────────────────────────────── ─ ─ ─ ─\n"
@@ -48754,7 +48756,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:145
+#: ../p2v/virt-p2v.pod:147
msgid ""
"The second panel on the left controls the virt-v2v output options. To "
"understand these options it is a really good idea to read the L<virt-v2v(1)> "
@@ -48764,7 +48766,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:152
+#: ../p2v/virt-p2v.pod:154
#, no-wrap
msgid ""
" │\n"
@@ -48784,14 +48786,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:166
+#: ../p2v/virt-p2v.pod:168
msgid ""
"All output options and paths are relative to the conversion server (I<not> "
"to the physical server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:169
+#: ../p2v/virt-p2v.pod:171
msgid ""
"The final option in this panel enables server-side debugging. This produces "
"a lot of output, but is essential if you are tracking down virt-p2v or "
@@ -48799,7 +48801,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:173
+#: ../p2v/virt-p2v.pod:175
#, no-wrap
msgid ""
" │\n"
@@ -48809,7 +48811,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:177
+#: ../p2v/virt-p2v.pod:179
msgid ""
"Finally in the left hand column is an information box giving the version of "
"virt-p2v (on the physical server) and virt-v2v (on the conversion server). "
@@ -48817,7 +48819,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:182
+#: ../p2v/virt-p2v.pod:184
msgid ""
"In the right hand column are three panels which control what hard disks, "
"removable media devices, and network interfaces, will be created in the "
@@ -48825,7 +48827,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:187
+#: ../p2v/virt-p2v.pod:189
#, no-wrap
msgid ""
" ─ ─ ───────────────────────────────────────┐\n"
@@ -48839,7 +48841,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:197
msgid ""
"Normally you would want to convert all hard disks. If you want virt-p2v to "
"completely ignore a local hard disk, uncheck it. The hard disk that "
@@ -48849,7 +48851,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:201
+#: ../p2v/virt-p2v.pod:203
#, no-wrap
msgid ""
" │\n"
@@ -48862,7 +48864,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:208
+#: ../p2v/virt-p2v.pod:210
msgid ""
"If the physical machine has CD or DVD drives, then you can use the Removable "
"media panel to create corresponding drives on the guest after conversion. "
@@ -48871,7 +48873,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:213
+#: ../p2v/virt-p2v.pod:215
#, no-wrap
msgid ""
" │\n"
@@ -48885,7 +48887,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:221
+#: ../p2v/virt-p2v.pod:223
msgid ""
"In the Network interfaces panel, select the network interfaces that should "
"be created in the guest after conversion. You can also connect these to "
@@ -48894,14 +48896,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:226
+#: ../p2v/virt-p2v.pod:228
msgid ""
"When you are ready to begin the conversion, press the C<Start conversion> "
"button:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:229
+#: ../p2v/virt-p2v.pod:231
#, no-wrap
msgid ""
" │\n"
@@ -48912,17 +48914,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:234
+#: ../p2v/virt-p2v.pod:236
msgid "CONVERSION RUNNING DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:236
+#: ../p2v/virt-p2v.pod:238
msgid "When conversion is running you will see this dialog:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:238
+#: ../p2v/virt-p2v.pod:240
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -48949,14 +48951,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:259
+#: ../p2v/virt-p2v.pod:261
msgid ""
"In the main scrolling area you will see log messages from the virt-v2v "
"process."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:262
+#: ../p2v/virt-p2v.pod:264
msgid ""
"Below the main area, virt-p2v shows you the location of the directory on the "
"conversion server that contains log files and other debugging information. "
@@ -48964,19 +48966,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:267
+#: ../p2v/virt-p2v.pod:269
msgid ""
"Once conversion has finished, you should shut down the physical machine. If "
"conversion is successful, you should never reboot it."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:270
+#: ../p2v/virt-p2v.pod:272
msgid "KERNEL COMMAND LINE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:272
+#: ../p2v/virt-p2v.pod:274
msgid ""
"If you don't want to configure things using the graphical UI, an alternative "
"is to configure through the kernel command line. This is especially "
@@ -48985,7 +48987,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:277
+#: ../p2v/virt-p2v.pod:279
msgid ""
"Where exactly you set command line arguments depends on your PXE "
"implementation, but for pxelinux you put them in the C<APPEND> field in the "
@@ -48993,7 +48995,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:281
+#: ../p2v/virt-p2v.pod:283
#, no-wrap
msgid ""
" DEFAULT p2v\n"
@@ -49007,22 +49009,22 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:288
+#: ../p2v/virt-p2v.pod:290
msgid "You have to set some or all of the following command line arguments:"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:292
+#: ../p2v/virt-p2v.pod:294
msgid "B<p2v.server=SERVER>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:294
+#: ../p2v/virt-p2v.pod:296
msgid "The name or IP address of the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:296
+#: ../p2v/virt-p2v.pod:298
msgid ""
"This is always required if you are using the kernel configuration method. "
"If virt-p2v does not find this on the kernel command line then it switches "
@@ -49030,39 +49032,39 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:300
+#: ../p2v/virt-p2v.pod:302
msgid "B<p2v.port=NN>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:302
+#: ../p2v/virt-p2v.pod:304
msgid "The SSH port number on the conversion server (default: C<22>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:304
+#: ../p2v/virt-p2v.pod:306
msgid "B<p2v.username=USERNAME>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:306
+#: ../p2v/virt-p2v.pod:308
msgid ""
"The SSH username that we log in as on the conversion server (default: "
"C<root>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:309
+#: ../p2v/virt-p2v.pod:311
msgid "B<p2v.password=PASSWORD>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:311
+#: ../p2v/virt-p2v.pod:313
msgid "The SSH password that we use to log in to the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:313
+#: ../p2v/virt-p2v.pod:315
msgid ""
"The default is to try with no password. If this fails then virt-p2v will "
"ask the user to type the password (probably several times during "
@@ -49070,19 +49072,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:317
+#: ../p2v/virt-p2v.pod:319
msgid ""
"Note that virt-p2v does not support authentication using key distribution at "
"this time."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:320
+#: ../p2v/virt-p2v.pod:322
msgid "B<p2v.sudo>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:322
+#: ../p2v/virt-p2v.pod:324
msgid ""
"Use C<p2v.sudo> to tell virt-p2v to use L<sudo(8)> to gain root privileges "
"on the conversion server after logging in as a non-root user (default: do "
@@ -49090,12 +49092,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:326
+#: ../p2v/virt-p2v.pod:328
msgid "B<p2v.name=GUESTNAME>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:328
+#: ../p2v/virt-p2v.pod:330
msgid ""
"The name of the guest that is created. The default is to try to derive a "
"name from the physical machine's hostname (if possible) else use a randomly "
@@ -49103,24 +49105,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:332
+#: ../p2v/virt-p2v.pod:334
msgid "B<p2v.vcpus=NN>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:334
+#: ../p2v/virt-p2v.pod:336
msgid ""
"The number of virtual CPUs to give to the guest. The default is to use the "
"same as the number of physical CPUs."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:337
+#: ../p2v/virt-p2v.pod:339
msgid "B<p2v.memory=NN(M|G)>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:339
+#: ../p2v/virt-p2v.pod:341
msgid ""
"The size of the guest memory. You can specify this in megabytes or "
"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
@@ -49128,17 +49130,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:343
+#: ../p2v/virt-p2v.pod:345
msgid "B<p2v.debug>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:345
+#: ../p2v/virt-p2v.pod:347
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:349
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -49146,17 +49148,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:351
+#: ../p2v/virt-p2v.pod:353
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:355
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:357
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -49164,17 +49166,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:359
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:361
msgid "B<p2v.removable=srX,srY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:363
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -49182,24 +49184,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:365
+#: ../p2v/virt-p2v.pod:367
msgid "B<p2v.interfaces=em1,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:369
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:370
+#: ../p2v/virt-p2v.pod:372
msgid "B<p2v.network=interface:target,...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:374
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -49207,14 +49209,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:376
+#: ../p2v/virt-p2v.pod:378
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:379
+#: ../p2v/virt-p2v.pod:381
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -49222,12 +49224,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:383
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:385
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -49235,50 +49237,50 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:387
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:388
+#: ../p2v/virt-p2v.pod:390
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:392
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:393
+#: ../p2v/virt-p2v.pod:395
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:396
+#: ../p2v/virt-p2v.pod:398
msgid "B<p2v.oa=sparse|preallocated>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:400
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:401
+#: ../p2v/virt-p2v.pod:403
msgid "B<p2v.oc=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:405
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v "
"I<-oc> option. See L<virt-v2v(1)/OPTIONS> and "
@@ -49286,85 +49288,85 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:407
+#: ../p2v/virt-p2v.pod:409
msgid "B<p2v.of=raw|qcow2|...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:411
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:412
+#: ../p2v/virt-p2v.pod:414
msgid "B<p2v.os=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:416
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:417
+#: ../p2v/virt-p2v.pod:419
msgid "If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:421
msgid "B<ip=dhcp>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:423
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:425
+#: ../p2v/virt-p2v.pod:427
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:429
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:441
+#: ../p2v/virt-p2v.pod:443
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:445
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:450
+#: ../p2v/virt-p2v.pod:452
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:460
+#: ../p2v/virt-p2v.pod:462
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:464
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:465
+#: ../p2v/virt-p2v.pod:467
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -49376,7 +49378,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:473
+#: ../p2v/virt-p2v.pod:475
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -49384,7 +49386,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:477
+#: ../p2v/virt-p2v.pod:479
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -49396,7 +49398,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:483
+#: ../p2v/virt-p2v.pod:485
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -49405,7 +49407,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:488
+#: ../p2v/virt-p2v.pod:490
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -49413,39 +49415,39 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:492
msgid "where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:493
+#: ../p2v/virt-p2v.pod:495
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:499 ../p2v/virt-p2v.pod:505 ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
msgid "I<before conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:501
+#: ../p2v/virt-p2v.pod:503
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:505
msgid "C<physical.xml>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:507
+#: ../p2v/virt-p2v.pod:509
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:511
+#: ../p2v/virt-p2v.pod:513
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -49453,44 +49455,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:515
+#: ../p2v/virt-p2v.pod:517
msgid "C<status>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:519
msgid "I<after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:521
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:522
+#: ../p2v/virt-p2v.pod:524
msgid "C<time>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:528
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:530
msgid "C<virt-v2v-conversion-log.txt>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:532
msgid "I<during/after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:534
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -49499,7 +49501,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:539
+#: ../p2v/virt-p2v.pod:541
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -49510,7 +49512,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:546
+#: ../p2v/virt-p2v.pod:548
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -49528,7 +49530,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:558
+#: ../p2v/virt-p2v.pod:560
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -49541,7 +49543,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:567
+#: ../p2v/virt-p2v.pod:569
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -49550,7 +49552,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:573
+#: ../p2v/virt-p2v.pod:575
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -49559,7 +49561,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:578
+#: ../p2v/virt-p2v.pod:580
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -49567,14 +49569,15 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:584
+#: ../p2v/virt-p2v.pod:586
msgid ""
"L<virt-p2v-make-disk(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, "
-"L<qemu-nbd(1)>, L<ssh(1)>, L<http://libguestfs.org/>."
+"L<qemu-nbd(1)>, L<ssh(1)>, L<sshd(8)>, L<sshd_config(5)>, "
+"L<http://libguestfs.org/>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:595 ../v2v/virt-v2v.pod:1446
+#: ../p2v/virt-p2v.pod:599 ../v2v/virt-v2v.pod:1446
msgid "Matthew Booth"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 15554e3..54bfada 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:01+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -397,7 +397,7 @@ msgstr ""
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
#: ../p2v/virt-p2v-make-disk.pod:49 ../p2v/virt-p2v-make-kickstart.pod:133
-#: ../p2v/virt-p2v.pod:433 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:435 ../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
@@ -417,7 +417,7 @@ msgstr "ПАРАМЕТРИ"
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
#: ../p2v/virt-p2v-make-disk.pod:53 ../p2v/virt-p2v-make-kickstart.pod:137
-#: ../p2v/virt-p2v.pod:437 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:439 ../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
@@ -792,7 +792,7 @@ msgstr ""
#: ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203
#: ../fish/guestfish.pod:419 ../format/virt-format.pod:153
#: ../fuse/guestmount.pod:359 ../inspector/virt-inspector.pod:122
-#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:446
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
#: ../v2v/virt-v2v.pod:613
@@ -807,7 +807,7 @@ msgstr "B<-v>"
#: ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205
#: ../fish/guestfish.pod:421 ../format/virt-format.pod:155
#: ../fuse/guestmount.pod:361 ../inspector/virt-inspector.pod:124
-#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:448
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
#: ../v2v/virt-v2v.pod:615
@@ -838,7 +838,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../fuse/guestmount.pod:365 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:203
#: ../p2v/virt-p2v-make-disk.pod:64 ../p2v/virt-p2v-make-kickstart.pod:152
-#: ../p2v/virt-p2v.pod:452 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
#: ../v2v/virt-v2v.pod:619
@@ -857,7 +857,7 @@ msgstr "B<-V>"
#: ../fuse/guestmount.pod:367 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:130 ../make-fs/virt-make-fs.pod:205
#: ../p2v/virt-p2v-make-disk.pod:66 ../p2v/virt-p2v-make-kickstart.pod:154
-#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:456 ../rescue/virt-rescue.pod:246
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
@@ -873,7 +873,7 @@ msgstr "B<--version>"
#: ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213
#: ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132
#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68
-#: ../p2v/virt-p2v-make-kickstart.pod:156 ../p2v/virt-p2v.pod:456
+#: ../p2v/virt-p2v-make-kickstart.pod:156 ../p2v/virt-p2v.pod:458
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
@@ -1461,7 +1461,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:498 ../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/virt-p2v-make-disk.pod:103
-#: ../p2v/virt-p2v-make-kickstart.pod:187 ../p2v/virt-p2v.pod:582
+#: ../p2v/virt-p2v-make-kickstart.pod:187 ../p2v/virt-p2v.pod:584
#: ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:755 ../ruby/examples/guestfs-ruby.pod:34
@@ -1504,7 +1504,7 @@ msgstr "АВТОР"
#: ../edit/virt-edit.pod:402 ../format/virt-format.pod:197
#: ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231
#: ../p2v/virt-p2v-make-disk.pod:112 ../p2v/virt-p2v-make-kickstart.pod:198
-#: ../p2v/virt-p2v.pod:593 ../rescue/virt-rescue.pod:424
+#: ../p2v/virt-p2v.pod:597 ../rescue/virt-rescue.pod:424
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
@@ -1532,7 +1532,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:521 ../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/virt-p2v-make-disk.pod:114
-#: ../p2v/virt-p2v-make-kickstart.pod:200 ../p2v/virt-p2v.pod:597
+#: ../p2v/virt-p2v-make-kickstart.pod:200 ../p2v/virt-p2v.pod:601
#: ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:52
@@ -1891,7 +1891,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../p2v/virt-p2v-make-disk.pod:110 ../p2v/virt-p2v-make-kickstart.pod:196
-#: ../p2v/virt-p2v.pod:591 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:595 ../perl/examples/guestfs-perl.pod:53
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4857
#: ../sysprep/virt-sysprep.pod:568 ../test-tool/libguestfs-test-tool.pod:186
@@ -1923,7 +1923,7 @@ 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:3522 ../p2v/virt-p2v-make-disk.pod:116
-#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:599
+#: ../p2v/virt-p2v-make-kickstart.pod:202 ../p2v/virt-p2v.pod:603
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4863
#: ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-partitions:280
#: ../v2v/virt-v2v.pod:1456
@@ -2428,7 +2428,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:139
-#: ../p2v/virt-p2v.pod:439 ../resize/virt-resize.pod:272
+#: ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272
#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:239
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -7970,7 +7970,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:1071 ../guestfs-release-notes.pod:1075
#: ../guestfs-release-notes.pod:1420 ../guestfs-release-notes.pod:1424
#: ../guestfs-release-notes.pod:1976 ../guestfs-release-notes.pod:1980
-#: ../p2v/virt-p2v.pod:423 ../p2v/virt-p2v.pod:429
+#: ../p2v/virt-p2v.pod:425 ../p2v/virt-p2v.pod:431
#: ../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
@@ -17272,7 +17272,7 @@ msgstr ""
#. type: =item
#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5056
-#: ../p2v/virt-p2v.pod:497 ../src/guestfs-actions.pod:361
+#: ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361
#: ../src/guestfs-actions.pod:8060
msgid "C<name>"
msgstr "C<name>"
@@ -19067,7 +19067,7 @@ msgstr ""
#: ../fish/guestfish-actions.pod:1053 ../src/guestfs-actions.pod:1547
msgid ""
"Create a btrfs subvolume. The C<dest> argument is the destination directory "
-"and the name of the snapshot, in the form C</path/to/dest/name>."
+"and the name of the subvolume, in the form C</path/to/dest/name>."
msgstr ""
#. type: =head2
@@ -19085,8 +19085,10 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:1060 ../src/guestfs-actions.pod:1560
-msgid "Delete the named btrfs subvolume."
-msgstr ""
+#, fuzzy
+#| msgid "btrfs-subvolume-snapshot"
+msgid "Delete the named btrfs subvolume or snapshot."
+msgstr "btrfs-subvolume-snapshot"
#. type: =head2
#: ../fish/guestfish-actions.pod:1062
@@ -21785,8 +21787,8 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:2336 ../src/guestfs-actions.pod:3713
msgid ""
-"Return the additional kernel options which are added to the guest kernel "
-"command line."
+"Return the additional kernel options which are added to the libguestfs "
+"appliance kernel command line."
msgstr ""
#. type: textblock
@@ -31325,10 +31327,12 @@ msgstr ""
#. type: textblock
#: ../fish/guestfish-actions.pod:6634 ../src/guestfs-actions.pod:10860
+#, fuzzy
+#| msgid "Pass additional options to the guest kernel."
msgid ""
-"This function is used to add additional options to the guest kernel command "
-"line."
-msgstr ""
+"This function is used to add additional options to the libguestfs appliance "
+"kernel command line."
+msgstr "Передати додаткові параметри ядру гостьової системи."
#. type: textblock
#: ../fish/guestfish-actions.pod:6637 ../src/guestfs-actions.pod:10863
@@ -42307,7 +42311,7 @@ msgstr "L<https://bugzilla.redhat.com/1142004>"
#. type: textblock
#: ../guestfs-release-notes.pod:341
msgid ""
-"virt-v2v prints waring:WARNING:/files/boot/grub/device.map references "
+"virt-v2v prints warning:WARNING:/files/boot/grub/device.map references "
"unknown device \"xvda\""
msgstr ""
@@ -52200,20 +52204,22 @@ msgstr ""
#: ../p2v/virt-p2v.pod:54
msgid ""
"The reverse port forwarding feature of ssh (ie. C<ssh -R>) is required by "
-"virt-p2v, and it will not work if this is disabled on the conversion server."
+"virt-p2v, and it will not work if this is disabled on the conversion "
+"server. (C<AllowTcpForwarding> must be C<yes> in the L<sshd_config(5)> file "
+"on the conversion server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:58
+#: ../p2v/virt-p2v.pod:59
msgid ""
"The conversion server does not need to be a physical machine. It could be a "
"virtual machine, as long as it has sufficient memory and disk space to do "
"the conversion, and as long as the physical machine can connect directly to "
-"its SSH port."
+"its SSH port. (See also L<virt-v2v(1)/RESOURCE REQUIREMENTS>)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:63
+#: ../p2v/virt-p2v.pod:65
msgid ""
"Because all of the data on the physical server's hard drive(s) has to be "
"copied over the network, the speed of conversion is largely determined by "
@@ -52221,12 +52227,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:67
+#: ../p2v/virt-p2v.pod:69
msgid "GUI INTERACTIVE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:69
+#: ../p2v/virt-p2v.pod:71
msgid ""
"When you start virt-p2v, you'll see a graphical configuration dialog that "
"walks you through connection to the conversion server, asks for the "
@@ -52235,17 +52241,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:75
+#: ../p2v/virt-p2v.pod:77
msgid "SSH CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:77
+#: ../p2v/virt-p2v.pod:79
msgid "When virt-p2v starts up in GUI mode, the first dialog looks like this:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:79
+#: ../p2v/virt-p2v.pod:81
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -52263,7 +52269,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:91
+#: ../p2v/virt-p2v.pod:93
msgid ""
"In the fields above, you must enter the hostname, SSH port number, remote "
"user name and password of the conversion server. The conversion server must "
@@ -52271,14 +52277,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:95
+#: ../p2v/virt-p2v.pod:97
msgid ""
"Normally you must log in to the conversion server as root, but if you check "
"the following box:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:98
+#: ../p2v/virt-p2v.pod:100
#, no-wrap
msgid ""
" │ │\n"
@@ -52288,7 +52294,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:102
+#: ../p2v/virt-p2v.pod:104
msgid ""
"then you can log in as another user, and virt-p2v will use the L<sudo(8)> "
"command to elevate privileges to root. Note that sudo must not require a "
@@ -52296,7 +52302,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:106
+#: ../p2v/virt-p2v.pod:108
msgid ""
"It is also possible to run virt-v2v on the conversion server entirely as non-"
"root, but output modes may be limited. Consult the L<virt-v2v(1)> manual "
@@ -52304,12 +52310,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:110
+#: ../p2v/virt-p2v.pod:112
msgid "At the bottom of the dialog are these buttons:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:112
+#: ../p2v/virt-p2v.pod:114
#, no-wrap
msgid ""
" │ │\n"
@@ -52322,7 +52328,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:119
+#: ../p2v/virt-p2v.pod:121
msgid ""
"You must press the C<Test connection> button first to test the SSH "
"connection to the conversion server. If that is successful (ie. you have "
@@ -52332,19 +52338,19 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:125
+#: ../p2v/virt-p2v.pod:127
msgid "DISK AND NETWORK CONFIGURATION DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:127
+#: ../p2v/virt-p2v.pod:129
msgid ""
"The second configuration dialog lets you configure the details of "
"conversion, including what to convert and where to send the guest."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:130
+#: ../p2v/virt-p2v.pod:132
msgid ""
"In the left hand column, starting at the top, the target properties let you "
"select the name of the guest (ie. after conversion) and how many virtual "
@@ -52353,7 +52359,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:135
+#: ../p2v/virt-p2v.pod:137
#, no-wrap
msgid ""
" ┌─────────────────────────────────────── ─ ─ ─ ─\n"
@@ -52369,7 +52375,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:145
+#: ../p2v/virt-p2v.pod:147
msgid ""
"The second panel on the left controls the virt-v2v output options. To "
"understand these options it is a really good idea to read the L<virt-v2v(1)> "
@@ -52379,7 +52385,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:152
+#: ../p2v/virt-p2v.pod:154
#, no-wrap
msgid ""
" │\n"
@@ -52399,14 +52405,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:166
+#: ../p2v/virt-p2v.pod:168
msgid ""
"All output options and paths are relative to the conversion server (I<not> "
"to the physical server)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:169
+#: ../p2v/virt-p2v.pod:171
msgid ""
"The final option in this panel enables server-side debugging. This produces "
"a lot of output, but is essential if you are tracking down virt-p2v or virt-"
@@ -52414,7 +52420,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:173
+#: ../p2v/virt-p2v.pod:175
#, no-wrap
msgid ""
" │\n"
@@ -52424,7 +52430,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:177
+#: ../p2v/virt-p2v.pod:179
msgid ""
"Finally in the left hand column is an information box giving the version of "
"virt-p2v (on the physical server) and virt-v2v (on the conversion server). "
@@ -52432,7 +52438,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:182
+#: ../p2v/virt-p2v.pod:184
msgid ""
"In the right hand column are three panels which control what hard disks, "
"removable media devices, and network interfaces, will be created in the "
@@ -52440,7 +52446,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:187
+#: ../p2v/virt-p2v.pod:189
#, no-wrap
msgid ""
" ─ ─ ───────────────────────────────────────┐\n"
@@ -52454,7 +52460,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:195
+#: ../p2v/virt-p2v.pod:197
msgid ""
"Normally you would want to convert all hard disks. If you want virt-p2v to "
"completely ignore a local hard disk, uncheck it. The hard disk that "
@@ -52464,7 +52470,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:201
+#: ../p2v/virt-p2v.pod:203
#, no-wrap
msgid ""
" │\n"
@@ -52477,7 +52483,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:208
+#: ../p2v/virt-p2v.pod:210
msgid ""
"If the physical machine has CD or DVD drives, then you can use the Removable "
"media panel to create corresponding drives on the guest after conversion. "
@@ -52486,7 +52492,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:213
+#: ../p2v/virt-p2v.pod:215
#, no-wrap
msgid ""
" │\n"
@@ -52500,7 +52506,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:221
+#: ../p2v/virt-p2v.pod:223
msgid ""
"In the Network interfaces panel, select the network interfaces that should "
"be created in the guest after conversion. You can also connect these to "
@@ -52509,14 +52515,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:226
+#: ../p2v/virt-p2v.pod:228
msgid ""
"When you are ready to begin the conversion, press the C<Start conversion> "
"button:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:229
+#: ../p2v/virt-p2v.pod:231
#, no-wrap
msgid ""
" │\n"
@@ -52527,17 +52533,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../p2v/virt-p2v.pod:234
+#: ../p2v/virt-p2v.pod:236
msgid "CONVERSION RUNNING DIALOG"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:236
+#: ../p2v/virt-p2v.pod:238
msgid "When conversion is running you will see this dialog:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:238
+#: ../p2v/virt-p2v.pod:240
#, no-wrap
msgid ""
" ┌────────────────────────────────────────────────────────┐\n"
@@ -52564,14 +52570,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:259
+#: ../p2v/virt-p2v.pod:261
msgid ""
"In the main scrolling area you will see log messages from the virt-v2v "
"process."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:262
+#: ../p2v/virt-p2v.pod:264
msgid ""
"Below the main area, virt-p2v shows you the location of the directory on the "
"conversion server that contains log files and other debugging information. "
@@ -52579,19 +52585,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:267
+#: ../p2v/virt-p2v.pod:269
msgid ""
"Once conversion has finished, you should shut down the physical machine. If "
"conversion is successful, you should never reboot it."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:270
+#: ../p2v/virt-p2v.pod:272
msgid "KERNEL COMMAND LINE CONFIGURATION"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:272
+#: ../p2v/virt-p2v.pod:274
msgid ""
"If you don't want to configure things using the graphical UI, an alternative "
"is to configure through the kernel command line. This is especially "
@@ -52600,7 +52606,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:277
+#: ../p2v/virt-p2v.pod:279
msgid ""
"Where exactly you set command line arguments depends on your PXE "
"implementation, but for pxelinux you put them in the C<APPEND> field in the "
@@ -52608,7 +52614,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:281
+#: ../p2v/virt-p2v.pod:283
#, no-wrap
msgid ""
" DEFAULT p2v\n"
@@ -52628,22 +52634,22 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:288
+#: ../p2v/virt-p2v.pod:290
msgid "You have to set some or all of the following command line arguments:"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:292
+#: ../p2v/virt-p2v.pod:294
msgid "B<p2v.server=SERVER>"
msgstr "B<p2v.server=СЕРВЕР>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:294
+#: ../p2v/virt-p2v.pod:296
msgid "The name or IP address of the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:296
+#: ../p2v/virt-p2v.pod:298
msgid ""
"This is always required if you are using the kernel configuration method. "
"If virt-p2v does not find this on the kernel command line then it switches "
@@ -52651,58 +52657,58 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:300
+#: ../p2v/virt-p2v.pod:302
msgid "B<p2v.port=NN>"
msgstr "B<p2v.port=NN>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:302
+#: ../p2v/virt-p2v.pod:304
msgid "The SSH port number on the conversion server (default: C<22>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:304
+#: ../p2v/virt-p2v.pod:306
msgid "B<p2v.username=USERNAME>"
msgstr "B<p2v.username=КОРИСТУВАЧ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:306
+#: ../p2v/virt-p2v.pod:308
msgid ""
"The SSH username that we log in as on the conversion server (default: "
"C<root>)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:309
+#: ../p2v/virt-p2v.pod:311
msgid "B<p2v.password=PASSWORD>"
msgstr "B<p2v.password=ПАРОЛЬ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:311
+#: ../p2v/virt-p2v.pod:313
msgid "The SSH password that we use to log in to the conversion server."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:313
+#: ../p2v/virt-p2v.pod:315
msgid ""
"The default is to try with no password. If this fails then virt-p2v will "
"ask the user to type the password (probably several times during conversion)."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:317
+#: ../p2v/virt-p2v.pod:319
msgid ""
"Note that virt-p2v does not support authentication using key distribution at "
"this time."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:320
+#: ../p2v/virt-p2v.pod:322
msgid "B<p2v.sudo>"
msgstr "B<p2v.sudo>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:322
+#: ../p2v/virt-p2v.pod:324
msgid ""
"Use C<p2v.sudo> to tell virt-p2v to use L<sudo(8)> to gain root privileges "
"on the conversion server after logging in as a non-root user (default: do "
@@ -52710,12 +52716,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:326
+#: ../p2v/virt-p2v.pod:328
msgid "B<p2v.name=GUESTNAME>"
msgstr "B<p2v.name=НАЗВА_ГОСТЬОВОЇ_СИСТЕМИ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:328
+#: ../p2v/virt-p2v.pod:330
msgid ""
"The name of the guest that is created. The default is to try to derive a "
"name from the physical machine's hostname (if possible) else use a randomly "
@@ -52723,24 +52729,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:332
+#: ../p2v/virt-p2v.pod:334
msgid "B<p2v.vcpus=NN>"
msgstr "B<p2v.vcpus=NN>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:334
+#: ../p2v/virt-p2v.pod:336
msgid ""
"The number of virtual CPUs to give to the guest. The default is to use the "
"same as the number of physical CPUs."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:337
+#: ../p2v/virt-p2v.pod:339
msgid "B<p2v.memory=NN(M|G)>"
msgstr "B<p2v.memory=NN(M|G)>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:339
+#: ../p2v/virt-p2v.pod:341
msgid ""
"The size of the guest memory. You can specify this in megabytes or "
"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
@@ -52748,17 +52754,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:343
+#: ../p2v/virt-p2v.pod:345
msgid "B<p2v.debug>"
msgstr "B<p2v.debug>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:345
+#: ../p2v/virt-p2v.pod:347
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:349
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -52766,17 +52772,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:351
+#: ../p2v/virt-p2v.pod:353
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr "B<p2v.disks=sdX,sdY,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:355
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:357
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -52786,17 +52792,17 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:359
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:361
msgid "B<p2v.removable=srX,srY,..>"
msgstr "B<p2v.removable=srX,srY,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:363
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -52804,24 +52810,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:365
+#: ../p2v/virt-p2v.pod:367
msgid "B<p2v.interfaces=em1,..>"
msgstr "B<p2v.interfaces=em1,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:369
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:370
+#: ../p2v/virt-p2v.pod:372
msgid "B<p2v.network=interface:target,...>"
msgstr "B<p2v.network=інтерфейс:призначення,...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:374
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -52829,14 +52835,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:376
+#: ../p2v/virt-p2v.pod:378
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:379
+#: ../p2v/virt-p2v.pod:381
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -52846,12 +52852,12 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:383
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:385
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -52861,136 +52867,136 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:387
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:388
+#: ../p2v/virt-p2v.pod:390
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr "B<p2v.o=[libvirt|local|...]>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:392
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:393
+#: ../p2v/virt-p2v.pod:395
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:396
+#: ../p2v/virt-p2v.pod:398
msgid "B<p2v.oa=sparse|preallocated>"
msgstr "B<p2v.oa=sparse|preallocated>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:400
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:401
+#: ../p2v/virt-p2v.pod:403
msgid "B<p2v.oc=...>"
msgstr "B<p2v.oc=...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:405
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v I<-"
"oc> option. See L<virt-v2v(1)/OPTIONS> and L<http://libvirt.org/uri.html>"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:407
+#: ../p2v/virt-p2v.pod:409
msgid "B<p2v.of=raw|qcow2|...>"
msgstr "B<p2v.of=raw|qcow2|...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:411
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:412
+#: ../p2v/virt-p2v.pod:414
msgid "B<p2v.os=...>"
msgstr "B<p2v.os=...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:416
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:417
+#: ../p2v/virt-p2v.pod:419
msgid ""
"If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:421
msgid "B<ip=dhcp>"
msgstr "B<ip=dhcp>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:423
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:425
+#: ../p2v/virt-p2v.pod:427
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr "B<ip=АДРЕСА:ШЛЮЗ:МАСКА_МЕРЕЖІ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:429
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:441
+#: ../p2v/virt-p2v.pod:443
msgid "B<--cmdline=CMDLINE>"
msgstr "B<--cmdline=РЯДОК_КОМАНДИ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:445
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:450
+#: ../p2v/virt-p2v.pod:452
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:460
+#: ../p2v/virt-p2v.pod:462
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:464
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:465
+#: ../p2v/virt-p2v.pod:467
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -53002,7 +53008,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:473
+#: ../p2v/virt-p2v.pod:475
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -53010,7 +53016,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:477
+#: ../p2v/virt-p2v.pod:479
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53022,7 +53028,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:483
+#: ../p2v/virt-p2v.pod:485
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -53031,7 +53037,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:488
+#: ../p2v/virt-p2v.pod:490
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -53039,40 +53045,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:492
msgid ""
"where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:493
+#: ../p2v/virt-p2v.pod:495
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:499 ../p2v/virt-p2v.pod:505 ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
msgid "I<before conversion>"
msgstr "I<до перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:501
+#: ../p2v/virt-p2v.pod:503
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:505
msgid "C<physical.xml>"
msgstr "C<physical.xml>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:507
+#: ../p2v/virt-p2v.pod:509
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:511
+#: ../p2v/virt-p2v.pod:513
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -53080,44 +53086,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:515
+#: ../p2v/virt-p2v.pod:517
msgid "C<status>"
msgstr "C<status>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:519
msgid "I<after conversion>"
msgstr "I<після перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:521
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:522
+#: ../p2v/virt-p2v.pod:524
msgid "C<time>"
msgstr "C<time>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:528
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:530
msgid "C<virt-v2v-conversion-log.txt>"
msgstr "C<virt-v2v-conversion-log.txt>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:532
msgid "I<during/after conversion>"
msgstr "I<підчас/після перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:534
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -53126,7 +53132,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:539
+#: ../p2v/virt-p2v.pod:541
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -53137,7 +53143,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:546
+#: ../p2v/virt-p2v.pod:548
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53155,7 +53161,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:558
+#: ../p2v/virt-p2v.pod:560
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -53168,7 +53174,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:567
+#: ../p2v/virt-p2v.pod:569
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -53177,7 +53183,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:573
+#: ../p2v/virt-p2v.pod:575
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -53186,7 +53192,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:578
+#: ../p2v/virt-p2v.pod:580
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -53194,14 +53200,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:584
+#: ../p2v/virt-p2v.pod:586
+#, fuzzy
+#| msgid ""
+#| "L<virt-p2v(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, L<http://"
+#| "libguestfs.org/>."
msgid ""
"L<virt-p2v-make-disk(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, "
-"L<qemu-nbd(1)>, L<ssh(1)>, L<http://libguestfs.org/>."
+"L<qemu-nbd(1)>, L<ssh(1)>, L<sshd(8)>, L<sshd_config(5)>, L<http://"
+"libguestfs.org/>."
msgstr ""
+"L<virt-p2v(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, L<http://"
+"libguestfs.org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:595 ../v2v/virt-v2v.pod:1446
+#: ../p2v/virt-p2v.pod:599 ../v2v/virt-v2v.pod:1446
msgid "Matthew Booth"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index d8b1bb9..c6cac8e 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try `%s --help' for more information.\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: failed to create handle\n"
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: unknown long option: %s (%d)\n"
@@ -3941,11 +3957,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -7000,37 +7016,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7099,106 +7115,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7207,109 +7223,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7317,38 +7337,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7358,13 +7378,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8048,7 +8067,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 3993804..26a0d14 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -49,7 +49,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -75,7 +75,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -607,7 +607,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -686,7 +686,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -696,7 +696,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -712,11 +712,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -734,7 +734,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -758,11 +758,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -904,7 +904,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -956,11 +956,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1042,7 +1042,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1154,7 +1154,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1222,7 +1222,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1281,7 +1281,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1317,7 +1317,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1348,11 +1348,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1859,7 +1859,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1974,11 +1974,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2205,11 +2205,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2245,7 +2245,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2259,7 +2259,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2270,7 +2270,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2322,7 +2322,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2336,7 +2336,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2358,7 +2358,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,11 +2376,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2537,7 +2537,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2557,11 +2557,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2589,7 +2589,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2613,7 +2613,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2625,7 +2625,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2693,7 +2693,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2703,7 +2703,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2753,7 +2753,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2770,6 +2770,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2811,7 +2823,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2827,7 +2839,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2871,7 +2883,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2951,7 +2963,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2963,13 +2975,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2978,7 +2990,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3018,6 +3030,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3132,13 +3148,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3205,7 +3221,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Intente con `%s --help' para más información.\n"
@@ -3244,7 +3260,7 @@ msgstr "guestfs_create: falló al crear manipulador\n"
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: opción extensa desconocida: %s (%d)\n"
@@ -3953,11 +3969,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -7121,37 +7137,37 @@ msgstr "%s: xmlOutputBufferCreateFd: falló al abrir stdout\n"
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr "%s: xmlNewTextWriter: falló al crear escritor libxml2\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7220,106 +7236,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7328,109 +7344,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7438,38 +7458,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7479,13 +7499,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8173,7 +8192,7 @@ msgstr "el tamaño de %s es irracionalmente largo (%<PRIi64> bytes)"
msgid "could not parse integer in version number: %s"
msgstr "no se pudo analizar el entero en el número de la versión: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "read: %s: fin de archivo no esperado"
diff --git a/po/gu.po b/po/gu.po
index f2f32af..fad716e 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -48,7 +48,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -685,7 +685,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -695,7 +695,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -711,11 +711,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -733,7 +733,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -757,11 +757,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -903,7 +903,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1280,7 +1280,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1316,7 +1316,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1347,11 +1347,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1858,7 +1858,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1973,11 +1973,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2204,11 +2204,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2244,7 +2244,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2258,7 +2258,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2269,7 +2269,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2321,7 +2321,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2335,7 +2335,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2357,7 +2357,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,11 +2375,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2556,11 +2556,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2588,7 +2588,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2612,7 +2612,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2624,7 +2624,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2692,7 +2692,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2702,7 +2702,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2752,7 +2752,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2769,6 +2769,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2810,7 +2822,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2826,7 +2838,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2870,7 +2882,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2950,7 +2962,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2962,13 +2974,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2977,7 +2989,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3017,6 +3029,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3131,13 +3147,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3204,7 +3220,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "વધારે જાણકારી માટે `%s --help' નો પ્રયત્ન કરો.\n"
@@ -3243,7 +3259,7 @@ msgstr "guestfs_create: હેન્ડલ ને બનાવવાનું
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: અજ્ઞાત લાંબો વિકલ્પ: %s (%d)\n"
@@ -3908,11 +3924,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6977,37 +6993,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7076,106 +7092,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7184,109 +7200,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7294,38 +7314,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7335,13 +7355,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8025,7 +8044,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 51c4892..44c02ea 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -48,7 +48,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -685,7 +685,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -695,7 +695,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -711,11 +711,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -733,7 +733,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -757,11 +757,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -903,7 +903,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1280,7 +1280,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1316,7 +1316,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1347,11 +1347,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1858,7 +1858,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1973,11 +1973,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2204,11 +2204,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2244,7 +2244,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2258,7 +2258,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2269,7 +2269,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2321,7 +2321,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2335,7 +2335,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2357,7 +2357,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,11 +2375,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2556,11 +2556,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2588,7 +2588,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2612,7 +2612,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2624,7 +2624,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2692,7 +2692,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2702,7 +2702,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2752,7 +2752,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2769,6 +2769,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2810,7 +2822,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2826,7 +2838,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2870,7 +2882,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2950,7 +2962,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2962,13 +2974,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2977,7 +2989,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3017,6 +3029,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3131,13 +3147,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3204,7 +3220,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "अधिक सूचना के लिए `%s --help' आजमाएँ.\n"
@@ -3243,7 +3259,7 @@ msgstr "guestfs_create: नियंत्रण बनाने में व
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: unknown long option: %s (%d)\n"
@@ -3908,11 +3924,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6975,37 +6991,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7074,106 +7090,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7182,109 +7198,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7292,38 +7312,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7333,13 +7353,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8023,7 +8042,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 97490c7..d076d0c 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ `%s -help' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ .\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿರ್ಮ
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ಗೊತ್ತಿರದ ಉದ್ದನೆಯ ಆಯ್ಕೆ: %s (%d)\n"
@@ -3910,11 +3926,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6979,37 +6995,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7078,106 +7094,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7186,109 +7202,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7296,38 +7316,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7337,13 +7357,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8027,7 +8046,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index bb8c25b..27d6cc6 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.28.3\n"
+"Project-Id-Version: libguestfs 1.28.4\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\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"
@@ -46,7 +46,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -604,7 +604,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -683,7 +683,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -693,7 +693,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -709,11 +709,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -731,7 +731,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -755,11 +755,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -901,7 +901,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -953,11 +953,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1039,7 +1039,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1137,7 +1137,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1151,7 +1151,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1219,7 +1219,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1314,7 +1314,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1345,11 +1345,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1856,7 +1856,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1971,11 +1971,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2202,11 +2202,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2242,7 +2242,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2256,7 +2256,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2267,7 +2267,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2319,7 +2319,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2333,7 +2333,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2355,7 +2355,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2373,11 +2373,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2534,7 +2534,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2554,11 +2554,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2586,7 +2586,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2610,7 +2610,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2622,7 +2622,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2690,7 +2690,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2700,7 +2700,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2750,7 +2750,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2767,6 +2767,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2808,7 +2820,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2824,7 +2836,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2868,7 +2880,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2948,7 +2960,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2960,13 +2972,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2975,7 +2987,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3015,6 +3027,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3129,13 +3145,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3202,7 +3218,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
@@ -3241,7 +3257,7 @@ msgstr ""
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr ""
@@ -3906,11 +3922,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6965,37 +6981,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7064,106 +7080,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7172,109 +7188,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7282,38 +7302,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7323,13 +7343,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8013,7 +8032,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index efd13c4..7efe71d 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "കൂടുതല് വിവരങ്ങള്ക്കായി `%s --help' ശ്രമിക്കുക.\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: ഹാന്ഡില് ഉണ്ടാക്ക
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: അപരിചിതമായ ലോങ് ഉപാധി: %s (%d)\n"
@@ -3907,11 +3923,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6977,37 +6993,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7076,106 +7092,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7184,109 +7200,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7294,38 +7314,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7335,13 +7355,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8025,7 +8044,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index ca5aa81..5db6367 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -48,7 +48,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -685,7 +685,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -695,7 +695,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -711,11 +711,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -733,7 +733,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -757,11 +757,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -903,7 +903,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1280,7 +1280,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1316,7 +1316,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1347,11 +1347,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1858,7 +1858,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1973,11 +1973,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2204,11 +2204,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2244,7 +2244,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2258,7 +2258,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2269,7 +2269,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2321,7 +2321,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2335,7 +2335,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2357,7 +2357,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,11 +2375,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2556,11 +2556,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2588,7 +2588,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2612,7 +2612,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2624,7 +2624,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2692,7 +2692,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2702,7 +2702,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2752,7 +2752,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2769,6 +2769,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2810,7 +2822,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2826,7 +2838,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2870,7 +2882,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2950,7 +2962,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2962,13 +2974,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2977,7 +2989,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3017,6 +3029,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3131,13 +3147,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3204,7 +3220,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "अधिक माहितीसाठी `%s --help' वापरून पहा.\n"
@@ -3243,7 +3259,7 @@ msgstr "guestfs_create: हँडल निर्माण करण्यास
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: अपरिचीत लाँग पर्याय: %s (%d)\n"
@@ -3943,11 +3959,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -7044,37 +7060,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout उघडण्यास अपय
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr "%s: xmlNewTextWriter: libxml2 राइटर निर्माण करण्यास अपयशी\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7143,106 +7159,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7251,109 +7267,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7361,38 +7381,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7402,13 +7422,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8092,7 +8111,7 @@ msgstr "%s चे आकार असमंजसपणे मोठे आह
msgid "could not parse integer in version number: %s"
msgstr "आवृत्ती क्रमांत इंटिजर वाचणे अशक्य: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 095c098..fc2aab3 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -49,7 +49,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -75,7 +75,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -607,7 +607,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -686,7 +686,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -696,7 +696,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -712,11 +712,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -734,7 +734,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -758,11 +758,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -904,7 +904,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -956,11 +956,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1042,7 +1042,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1140,7 +1140,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1154,7 +1154,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1222,7 +1222,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1281,7 +1281,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1317,7 +1317,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1348,11 +1348,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1859,7 +1859,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1974,11 +1974,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2205,11 +2205,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2245,7 +2245,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2259,7 +2259,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2270,7 +2270,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2322,7 +2322,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2336,7 +2336,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2358,7 +2358,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,11 +2376,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2537,7 +2537,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2557,11 +2557,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2589,7 +2589,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2613,7 +2613,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2625,7 +2625,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2693,7 +2693,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2703,7 +2703,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2753,7 +2753,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2770,6 +2770,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2811,7 +2823,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2827,7 +2839,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2871,7 +2883,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2951,7 +2963,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2963,13 +2975,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2978,7 +2990,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3018,6 +3030,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3132,13 +3148,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3205,7 +3221,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie\n"
@@ -3244,7 +3260,7 @@ msgstr "guestfs_create: hendel aanmaken mislukte\n"
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: onbekende lange optie: %s (%d)\n"
@@ -3951,12 +3967,12 @@ msgid "enable or disable the seeding feature of device"
msgstr "aanzetten of uitzetten van de zaai functie van een apparaat"
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
-msgstr "maak een btrfs snapshot aan"
+msgid "create a btrfs subvolume"
+msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
-msgstr "verwijder een btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
+msgstr ""
#: fish/cmds.c:3866
msgid "list btrfs snapshots and subvolumes"
@@ -7154,37 +7170,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout openen mislukte\n"
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr "%s: xmlNewTextWriter: libxml2 schrijver aanmaken mislukte\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr "%s: kan XML niet van stdin parsen\n"
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr "%s: kan geen nieuwe XPath context creëren\n"
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr "%s: niet in staat XPath expressie te evalueren\n"
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr "%s: xmlSaveToFd mislukte\n"
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr "%s: xmlNewDoc mislukte\n"
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr "%s: xmlCopyNode mislukte\n"
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr "%s: xmlSaveDoc mislukte\n"
@@ -7253,106 +7269,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7361,109 +7377,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7471,38 +7491,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7512,13 +7532,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8223,7 +8242,7 @@ msgstr "groote van %s is buitensporig groot (%<PRIi64> bytes)"
msgid "could not parse integer in version number: %s"
msgstr "kon integer in versie nummer niet ontleden: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "lezen: %s: onverwacht einde van bestand"
@@ -8998,3 +9017,9 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
+
+#~ msgid "create a btrfs snapshot"
+#~ msgstr "maak een btrfs snapshot aan"
+
+#~ msgid "delete a btrfs snapshot"
+#~ msgstr "verwijder een btrfs snapshot"
diff --git a/po/or.po b/po/or.po
index 4afa438..a9394b9 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ଅଧିକ ସୂଚନା ପାଇଁ `%s --help' କୁ ଚେଷ୍ଟା କରନ୍ତୁ।\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: ନିୟନ୍ତ୍ରଣ ପ୍ରସ୍ତୁତ କ
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ଅଜଣା ଲମ୍ବା ବିକଳ୍ପ: %s (%d)\n"
@@ -3907,11 +3923,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6975,37 +6991,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7074,106 +7090,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7182,109 +7198,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7292,38 +7312,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7333,13 +7353,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8023,7 +8042,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 83cdc74..74d0ff4 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -48,7 +48,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -606,7 +606,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -685,7 +685,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -695,7 +695,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -711,11 +711,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -733,7 +733,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -757,11 +757,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -903,7 +903,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -955,11 +955,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1139,7 +1139,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1153,7 +1153,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1221,7 +1221,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1280,7 +1280,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1316,7 +1316,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1347,11 +1347,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1858,7 +1858,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1973,11 +1973,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2204,11 +2204,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2244,7 +2244,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2258,7 +2258,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2269,7 +2269,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2321,7 +2321,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2335,7 +2335,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2357,7 +2357,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,11 +2375,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2536,7 +2536,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2556,11 +2556,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2588,7 +2588,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2612,7 +2612,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2624,7 +2624,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2692,7 +2692,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2702,7 +2702,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2752,7 +2752,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2769,6 +2769,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2810,7 +2822,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2826,7 +2838,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2870,7 +2882,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2950,7 +2962,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2962,13 +2974,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2977,7 +2989,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3017,6 +3029,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3131,13 +3147,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3204,7 +3220,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਵਰਤੋ।\n"
@@ -3243,7 +3259,7 @@ msgstr "guestfs_create: ਹੈਂਡਲ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ਅਣਜਾਣ long ਚੋਣ: %s (%d)\n"
@@ -3942,11 +3958,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -7041,37 +7057,37 @@ msgstr "%s: xmlOutputBufferCreateFd: stdout ਨੂੰ ਖੋਲਣ ਤੋਂ ਫ
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr "%s: xmlNewTextWriter: libxml2 ਰਾਈਟਰ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7140,106 +7156,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7248,109 +7264,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7358,38 +7378,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7399,13 +7419,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8089,7 +8108,7 @@ msgstr "%s ਦਾ ਅਕਾਰ ਬੇਲੋੜਾ ਹੈ (%<PRIi64> ਬਾਈਟ
msgid "could not parse integer in version number: %s"
msgstr "ਵਰਜਨ ਨੰਬਰ ਵਿੱਚ ਪੂਰਨਅੰਕ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index ef43cc9..32ce22b 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -51,7 +51,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -77,7 +77,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -609,7 +609,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -698,7 +698,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -714,11 +714,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -736,7 +736,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -760,11 +760,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -906,7 +906,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -958,11 +958,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1142,7 +1142,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1156,7 +1156,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1224,7 +1224,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1283,7 +1283,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1319,7 +1319,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1350,11 +1350,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1861,7 +1861,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1976,11 +1976,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2207,11 +2207,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2247,7 +2247,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2261,7 +2261,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2272,7 +2272,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2324,7 +2324,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2338,7 +2338,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2360,7 +2360,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2378,11 +2378,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2539,7 +2539,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2559,11 +2559,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2591,7 +2591,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2615,7 +2615,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2627,7 +2627,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2695,7 +2695,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2705,7 +2705,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2755,7 +2755,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2772,6 +2772,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2813,7 +2825,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2829,7 +2841,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2873,7 +2885,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2953,7 +2965,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2965,13 +2977,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2980,7 +2992,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3020,6 +3032,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3134,13 +3150,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3207,7 +3223,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Należy spróbować \"%s --help\", aby uzyskać więcej informacji.\n"
@@ -3246,7 +3262,7 @@ msgstr "guestfs_create: utworzenie programu obsługi się nie powiodło\n"
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: nieznana długa opcja: %s (%d)\n"
@@ -3955,12 +3971,12 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
-msgstr "tworzy migawkę btrfs"
+msgid "create a btrfs subvolume"
+msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
-msgstr "usuwa migawkę btrfs"
+msgid "delete a btrfs subvolume or snapshot"
+msgstr ""
#: fish/cmds.c:3866
msgid "list btrfs snapshots and subvolumes"
@@ -7172,37 +7188,37 @@ msgstr ""
"%s: xmlNewTextWriter: utworzenie modułu zapisującego libxml2 się nie "
"powiodło\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr "%s: nie można przetworzyć XML ze standardowego wejścia\n"
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr "%s: nie można utworzyć nowego kontekstu XPath\n"
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr "%s: nie można sprawdzić wyrażenia XPath\n"
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr "%s: xmlSaveToFd się nie powiodło\n"
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr "%s: xmlNewDoc się nie powiodło\n"
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr "%s: xmlCopyNode się nie powiodło\n"
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr "%s: xmlSaveDoc się nie powiodło\n"
@@ -7271,106 +7287,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7379,109 +7395,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7489,38 +7509,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7530,13 +7550,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8247,7 +8266,7 @@ msgstr "rozmiar %s jest nierozsądnie duży (%<PRIi64> bajtów)"
msgid "could not parse integer in version number: %s"
msgstr "nie można przetworzyć liczby całkowitej w numerze wersji: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "odczyt: %s: nieoczekiwany koniec pliku"
@@ -9026,3 +9045,9 @@ msgstr "virt-win-reg: {p}: nie można pobrać pliku rejestru: {err}\n"
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: nie można wysłać pliku rejestru: {err}\n"
+
+#~ msgid "create a btrfs snapshot"
+#~ msgstr "tworzy migawkę btrfs"
+
+#~ msgid "delete a btrfs snapshot"
+#~ msgstr "usuwa migawkę btrfs"
diff --git a/po/ta.po b/po/ta.po
index f4c6622..9e7a510 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "`%s --help' க்கான கூடுதல் தகவலுக்கு முயற்சிக்கவும்.\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: ஹாண்டிலை உருவாக்க மு
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: தெரியாத நீண்ட விருப்பம்: %s (%d)\n"
@@ -3907,11 +3923,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6976,37 +6992,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7075,106 +7091,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7183,109 +7199,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7293,38 +7313,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7334,13 +7354,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8024,7 +8043,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/te.po b/po/te.po
index a822e8c..56f7376 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -47,7 +47,7 @@ msgstr ""
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -605,7 +605,7 @@ msgstr ""
msgid "-os %s: output directory does not exist or is not a directory"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -694,7 +694,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -756,11 +756,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr ""
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr ""
@@ -902,7 +902,7 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -954,11 +954,11 @@ msgstr ""
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
msgid "Ignore partition"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr ""
@@ -1152,7 +1152,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr ""
@@ -1220,7 +1220,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1279,7 +1279,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr ""
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr ""
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Output vol UUID(s)"
msgstr ""
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr ""
@@ -1346,11 +1346,11 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -1857,7 +1857,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -1972,11 +1972,11 @@ msgid ""
"virtual machine's disk, but it was stored on disk in older distros."
msgstr ""
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2203,11 +2203,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
@@ -2257,7 +2257,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2268,7 +2268,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2320,7 +2320,7 @@ msgstr ""
msgid "discard/trim is not supported: %s"
msgstr ""
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2334,7 +2334,7 @@ msgid ""
"format"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,11 +2374,11 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
msgid "in the libvirt XML metadata, <domain type='...'> is missing or empty"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
@@ -2555,11 +2555,11 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
@@ -2587,7 +2587,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -2611,7 +2611,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2623,7 +2623,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr ""
@@ -2691,7 +2691,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr ""
@@ -2701,7 +2701,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "output '%s' cannot be a character device, it must be a regular file"
msgstr ""
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -2768,6 +2768,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -2809,7 +2821,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2825,7 +2837,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2869,7 +2881,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -2949,7 +2961,7 @@ msgid ""
"The guest will be configured to use a slower emulated device."
msgstr ""
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr ""
@@ -2961,13 +2973,13 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
msgstr ""
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -2976,7 +2988,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3016,6 +3028,10 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3130,13 +3146,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3203,7 +3219,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "అధిక సమాచారము కొరకు `%s --help' ప్రయత్నించండి\n"
@@ -3242,7 +3258,7 @@ msgstr "guestfs_create: సంభాలికను సృష్టించు
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: తెలియని long ఐచ్చికము: %s (%d)\n"
@@ -3907,11 +3923,11 @@ msgid "enable or disable the seeding feature of device"
msgstr ""
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
+msgid "create a btrfs subvolume"
msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
+msgid "delete a btrfs subvolume or snapshot"
msgstr ""
#: fish/cmds.c:3866
@@ -6973,37 +6989,37 @@ msgstr ""
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr ""
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr ""
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr ""
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr ""
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr ""
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr ""
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr ""
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr ""
@@ -7072,106 +7088,106 @@ msgstr ""
msgid "%s: subprocess failed\n"
msgstr ""
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr ""
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr ""
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr ""
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr ""
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr ""
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr ""
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr ""
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr ""
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7180,109 +7196,113 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr ""
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr ""
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr ""
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr ""
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr ""
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7290,38 +7310,38 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr ""
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr ""
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -7331,13 +7351,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr ""
@@ -8021,7 +8040,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 9d38652..f184b32 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-11-15 20:17+0000\n"
+"POT-Creation-Date: 2014-11-30 01:40+0000\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -54,7 +54,7 @@ msgstr "%s"
#. ../customize/customize_main.ml:238
#. ../builder/get_kernel.ml:52
#. ../builder/builder.ml:647
-#: ../v2v/v2v.ml:624 ../v2v/v2v.ml:507 ../sysprep/main.ml:266
+#: ../v2v/v2v.ml:632 ../v2v/v2v.ml:515 ../sysprep/main.ml:266
msgid "%s (ignored)"
msgstr "%s (проігноровано)"
@@ -90,7 +90,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr "у командному рядку параметр %s використано декілька разів"
-#: ../v2v/convert_linux.ml:1323
+#: ../v2v/convert_linux.ml:1320
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -737,7 +737,7 @@ msgstr "-o vdsm: не вказано сховище виведення дани
msgid "-os %s: output directory does not exist or is not a directory"
msgstr "-os %s: каталогу виведення даних не існує або вказано не каталог"
-#: ../v2v/input_libvirtxml.ml:181
+#: ../v2v/input_libvirtxml.ml:188
msgid "<disk type='%s'> was ignored"
msgstr "<disk type='%s'> проігноровано"
@@ -823,7 +823,7 @@ msgstr "Перевірити числові підписи"
msgid "Check there is enough space in $TMPDIR"
msgstr "Перевірити, чи достатньо місця у $TMPDIR"
-#: ../v2v/v2v.ml:238
+#: ../v2v/v2v.ml:245
msgid "Checking for sufficient free disk space in the guest"
msgstr "Перевіряємо, чи достатньо вільного місця на диску гостьової системи"
@@ -835,7 +835,7 @@ msgstr ""
"Спорожнюємо резервну пам’ять Linux на %s…\n"
"%!"
-#: ../v2v/v2v.ml:286
+#: ../v2v/v2v.ml:293
msgid "Closing the overlay"
msgstr "Закриваємо оверлей"
@@ -851,11 +851,11 @@ msgstr "Стиснутий формат виведення даних"
msgid "Converting %s to %s"
msgstr "Перетворюємо %s на %s"
-#: ../v2v/v2v.ml:253
+#: ../v2v/v2v.ml:260
msgid "Converting %s to run on KVM"
msgstr "Перетворюємо %s для уможливлення запуску у KVM"
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:258
msgid "Converting the guest to run on KVM"
msgstr "Перетворюємо гостьову систему для запуску у KVM"
@@ -875,7 +875,7 @@ msgstr "Копіювання"
msgid "Copying %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:314
msgid "Copying disk %d/%d to %s (%s)"
msgstr "Копіювання диска %d з %d на %s (%s)"
@@ -903,11 +903,11 @@ msgstr ""
msgid "Create symbolic links"
msgstr "Створювати символічні посилання"
-#: ../v2v/v2v.ml:125
+#: ../v2v/v2v.ml:130
msgid "Creating an overlay to protect the source from being modified"
msgstr "Створюємо оверлей для захисту джерела від внесення змін"
-#: ../v2v/v2v.ml:409
+#: ../v2v/v2v.ml:417
msgid "Creating output metadata"
msgstr "Створюємо метадані результатів"
@@ -1059,7 +1059,7 @@ msgstr "Розмір отриманого:"
msgid "Downloading: %s"
msgstr "Отримуємо: %s"
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:451
msgid ""
"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -1111,11 +1111,11 @@ msgstr "Увімкнути трасування викликів libguestfs"
msgid "Enable/disable specific operations"
msgstr "Увімкнути або вимкнути специфічні операції"
-#: ../v2v/v2v.ml:456
+#: ../v2v/v2v.ml:464
msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
-#: ../v2v/v2v.ml:242
+#: ../v2v/v2v.ml:249
msgid "Estimating space required on target for each disk"
msgstr "Оцінюємо простір, потрібний у системі призначення для кожного з дисків"
@@ -1208,7 +1208,7 @@ msgstr "Відбиток чинного ключа підписування"
msgid "Fingerprint: %s\n"
msgstr "Відбиток: %s\n"
-#: ../v2v/v2v.ml:423 ../customize/customize_main.ml:248
+#: ../v2v/v2v.ml:431 ../customize/customize_main.ml:248
#: ../builder/builder.ml:696
msgid "Finishing off"
msgstr "Завершуємо"
@@ -1317,7 +1317,7 @@ msgstr "Ігнорувати файлову систему"
msgid "Ignore partition"
msgstr "Ігнорувати розділ"
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:190
msgid "Initializing the target %s"
msgstr "Ініціалізуємо призначення %s"
@@ -1333,7 +1333,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr "Формат вхідних даних (для -i диск)"
-#: ../v2v/v2v.ml:217
+#: ../v2v/v2v.ml:224
msgid "Inspecting the overlay"
msgstr "Вивчаємо оверлей"
@@ -1401,7 +1401,7 @@ msgstr "Відобразити місток «in» на «out»"
msgid "Map network 'in' to 'out'"
msgstr "Відобразити мережу «in» на «out»"
-#: ../v2v/v2v.ml:282
+#: ../v2v/v2v.ml:289
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
"Виконуємо прив’язку даних файлової системи для уникнення копіювання "
@@ -1473,7 +1473,7 @@ msgstr ""
msgid "Opening the new disk"
msgstr "Відкриваємо новий диск"
-#: ../v2v/v2v.ml:153
+#: ../v2v/v2v.ml:158
msgid "Opening the overlay"
msgstr "Відкриваємо оверлей"
@@ -1509,7 +1509,7 @@ msgstr "Розмір виведення"
msgid "Output vol UUID(s)"
msgstr "UUID виведених томів"
-#: ../v2v/v2v.ml:419
+#: ../v2v/v2v.ml:427
msgid "Overlay saved as %s [--debug-overlays]\n"
msgstr "Оверлей збережено як %s [--debug-overlays]\n"
@@ -1540,11 +1540,11 @@ msgstr "Нотатки POD для %s не повинні завершувати
msgid "Perform a dry run"
msgstr "Виконати тестовий запуск"
-#: ../v2v/v2v.ml:483
+#: ../v2v/v2v.ml:491
msgid "Picked %s because '--root %s' was used."
msgstr ""
-#: ../v2v/v2v.ml:474
+#: ../v2v/v2v.ml:482
msgid "Picked %s because '--root first' was used."
msgstr ""
@@ -2120,7 +2120,7 @@ msgstr ""
" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
-#: ../v2v/convert_linux.ml:1113
+#: ../v2v/convert_linux.ml:1114
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2286,11 +2286,11 @@ msgstr ""
"тому не є частиною віртуальної машини на диску, але ці дані зберігаються\n"
"на диску у старіших версіях дистрибутивів."
-#: ../v2v/v2v.ml:272
+#: ../v2v/v2v.ml:279
msgid "This guest does not have virtio drivers installed."
msgstr ""
-#: ../v2v/v2v.ml:270
+#: ../v2v/v2v.ml:277
msgid "This guest has virtio drivers installed."
msgstr ""
@@ -2562,11 +2562,11 @@ msgid ""
" - Check no one has tampered with the website or your network!"
msgstr ""
-#: ../v2v/v2v.ml:463
+#: ../v2v/v2v.ml:471
msgid "connection closed"
msgstr "з'єднання закрито"
-#: ../v2v/convert_linux.ml:1043
+#: ../v2v/convert_linux.ml:1044
msgid "could not add grub2 serial console (ignored)"
msgstr "не вдалося додати послідовну консоль grub2 (проігноровано)"
@@ -2608,7 +2608,7 @@ msgstr ""
"не вдалося обробити параметр «-ic %s». Початкове повідомлення щодо помилки: "
"%s"
-#: ../v2v/input_ova.ml:225
+#: ../v2v/input_ova.ml:242
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr "не вдалося обробити значення rasd:HostResource диска з документа OVF"
@@ -2625,7 +2625,7 @@ msgstr ""
"командному рядку. Чи справді це %s OVirt або RHEV-M? Початкове повідомлення "
"щодо помилки: %s"
-#: ../v2v/convert_linux.ml:1061
+#: ../v2v/convert_linux.ml:1062
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2639,7 +2639,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr "не вдалося оновити буфер libvirt %s"
-#: ../v2v/convert_linux.ml:1045
+#: ../v2v/convert_linux.ml:1046
msgid "could not remove grub2 serial console (ignored)"
msgstr "не вдалося вилучити послідовну консоль grub2 (проігноровано)"
@@ -2695,7 +2695,7 @@ msgstr "заборонений символ (%c) у назві операції"
msgid "discard/trim is not supported: %s"
msgstr "підтримки відкидання або обрізання не передбачено: %s"
-#: ../v2v/v2v.ml:193
+#: ../v2v/v2v.ml:200
msgid ""
"disk %s (%s) has no defined format.\n"
"\n"
@@ -2720,7 +2720,7 @@ msgstr ""
"використати параметр «-of» для примусового визначення формату виведення "
"даних."
-#: ../v2v/input_libvirtxml.ml:108
+#: ../v2v/input_libvirtxml.ml:110
msgid "display <graphics type='%s'> in the input libvirt XML was ignored"
msgstr ""
@@ -2746,7 +2746,7 @@ msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
"спосіб вилучення пакунків за допомогою %s невідомий програмі: пакунки: %s"
-#: ../v2v/convert_linux.ml:1168
+#: ../v2v/convert_linux.ml:1169
msgid "don't know how to update %s which loads the %s module"
msgstr "спосіб оновлення %s, який завантажує модуль %s, невідомий програмі"
@@ -2766,11 +2766,11 @@ msgstr ""
"Помилка під час обробки адреси «%s». Ознайомтеся з повідомленнями щодо "
"помилок, які виведено раніше."
-#: ../v2v/input_ova.ml:193
+#: ../v2v/input_ova.ml:210
msgid "error parsing disk fileRef"
msgstr ""
-#: ../v2v/input_ova.ml:211
+#: ../v2v/input_ova.ml:228
msgid "error uncompressing %s, see earlier error messages"
msgstr ""
@@ -2940,7 +2940,7 @@ msgstr ""
"у метаданих XML libvirt пропущено <domain type='...'> або вказано порожнє "
"значення"
-#: ../v2v/input_libvirtxml.ml:72
+#: ../v2v/input_libvirtxml.ml:74
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr "у метаданих XML libvirt пропущено <name> або вказано порожнє значення"
@@ -2960,11 +2960,11 @@ msgstr "внутрішня помилка: помилка оцінки у %s, р
msgid "internal error: invalid argument: %s"
msgstr "внутрішня помилка: некоректний аргумент: %s"
-#: ../v2v/v2v.ml:319
+#: ../v2v/v2v.ml:326
msgid "internal error: qemu corrupted the overlay file"
msgstr "внутрішня помилка: файл оверлею пошкоджено qemu"
-#: ../v2v/v2v.ml:147
+#: ../v2v/v2v.ml:152
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr "внутрішня помилка: qemu-img не створено оверлею із резервним файлом"
@@ -2992,7 +2992,7 @@ msgstr "ядро %s перебуває поза ієрархією grub %s"
msgid "libguestfs error: %s"
msgstr "помилка libguestfs: %s"
-#: ../v2v/v2v.ml:490
+#: ../v2v/v2v.ml:498
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 "
@@ -3025,7 +3025,7 @@ msgstr ""
"того, можливо, вам слід повторно запустити virt-v2v від імені користувача "
"root."
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:478
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -3040,7 +3040,7 @@ msgid ""
"twice"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:177
+#: ../v2v/input_libvirtxml.ml:184
msgid "network <disk> with <source protocol='%s'> was ignored"
msgstr "мережу <disk> з <source protocol='%s'> проігноровано"
@@ -3118,7 +3118,7 @@ msgid ""
"Please file a bug, giving the command line arguments you used."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/v2v.ml:444
msgid "no root device found in this operating system image."
msgstr "у цьому образі операційної системи не знайдено кореневого пристрою."
@@ -3130,7 +3130,7 @@ msgstr ""
"немає підтримки віддалених з’єднань libvirt з «-ic %s». Перетворення може "
"призвести до помилок під час спроб прочитати диски джерел даних."
-#: ../v2v/v2v.ml:569
+#: ../v2v/v2v.ml:577
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -3188,7 +3188,7 @@ msgstr ""
"виведенням «%s» не може бути символьний пристрій, виводити дані можна лише "
"до звичайного файла"
-#: ../v2v/v2v.ml:203
+#: ../v2v/v2v.ml:210
msgid ""
"output format should be 'raw' or 'qcow2'.\n"
"\n"
@@ -3212,6 +3212,18 @@ msgid ""
"block device = %s, output block device size = %s"
msgstr ""
+#: ../v2v/input_ova.ml:176
+msgid ""
+"ova disk has an unknown VMware controller type (%d), please report this as a "
+"bug supplying the *.ovf file extracted from the ova"
+msgstr ""
+
+#: ../v2v/input_ova.ml:173
+msgid ""
+"ova disk has no parent controller, please report this as a bug supplying the "
+"*.ovf file extracted from the ova"
+msgstr ""
+
#: ../v2v/convert_linux.ml:154
msgid "package '%s' contains no files"
msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
"pwrite: незавершений запис під час відновлення заголовка розділу резервної "
"пам’яті"
-#: ../v2v/v2v.ml:360 ../v2v/v2v.ml:143
+#: ../v2v/v2v.ml:367 ../v2v/v2v.ml:148
msgid "qemu-img command failed, see earlier errors"
msgstr ""
"помилка під час спроби виконати qemu-img, див. попередні повідомлення щодо "
@@ -3278,7 +3290,7 @@ msgstr ""
msgid "resize2fs"
msgstr "resize2fs"
-#: ../v2v/v2v.ml:481
+#: ../v2v/v2v.ml:489
msgid "root device %s not found. Roots found were: %s"
msgstr ""
"не знайдено кореневого пристрою %s. Знайдено такі кореневі пристрої: %s"
@@ -3323,7 +3335,7 @@ msgstr ""
msgid "source disk has <source dev=...> attribute in XML"
msgstr ""
-#: ../v2v/v2v.ml:81
+#: ../v2v/v2v.ml:86
msgid "source has no hard disks!"
msgstr ""
@@ -3428,7 +3440,7 @@ msgstr ""
"Гостьову систему буде налаштовано на використання повільнішого емульованого "
"пристрою."
-#: ../v2v/input_libvirtxml.ml:132
+#: ../v2v/input_libvirtxml.ml:134
msgid "this guest has no non-removable disks"
msgstr "у цій гостьовій системі немає непортативних дисків"
@@ -3440,7 +3452,7 @@ msgstr "для цього типу гостьових систем не можн
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1212
+#: ../v2v/convert_linux.ml:1213
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3448,7 +3460,7 @@ msgstr ""
"не вдалося знайти жодного коректного файла налаштувань modprobe, зокрема /"
"etc/modprobe.conf"
-#: ../v2v/v2v.ml:502
+#: ../v2v/v2v.ml:510
msgid ""
"unable to mount the disk image for writing. This has probably happened "
"because Windows Hibernation or Fast Restart is being used in this guest. You "
@@ -3463,7 +3475,7 @@ msgstr ""
"\n"
"Початкове повідомлення щодо помилки: %s"
-#: ../v2v/convert_linux.ml:910
+#: ../v2v/convert_linux.ml:911
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3506,6 +3518,10 @@ msgstr "невідомий параметр -oa: %s"
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr "невідома гостьова операційна система: %s %s %d.%d (%s)"
+#: ../v2v/v2v.ml:78
+msgid "unknown source hypervisor ('%s') in metadata"
+msgstr ""
+
#: ../resize/resize.ml:564
msgid "unknown/unavailable method for expanding filesystem %s"
msgstr ""
@@ -3624,13 +3640,13 @@ msgstr ""
msgid "virt-resize is not installed (or does not work)"
msgstr ""
-#: ../v2v/input_libvirtxml.ml:105
+#: ../v2v/input_libvirtxml.ml:107
msgid ""
"virt-v2v does not support local displays, so <graphics type='%s'> in the "
"input libvirt XML was ignored"
msgstr ""
-#: ../v2v/v2v.ml:262
+#: ../v2v/v2v.ml:269
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
"virt-v2v не може виконувати перетворення цього типу гостьових систем (%s/%s)"
@@ -3706,7 +3722,7 @@ msgstr ""
#: align/scan.c:73 cat/cat.c:53 cat/filesystems.c:87 cat/log.c:62 cat/ls.c:83
#: df/main.c:66 diff/diff.c:92 edit/edit.c:63 fish/fish.c:105
#: fuse/guestmount.c:100 fuse/guestunmount.c:52 inspector/inspector.c:67
-#: make-fs/make-fs.c:73 p2v/main.c:67 rescue/rescue.c:56
+#: make-fs/make-fs.c:73 p2v/main.c:65 rescue/rescue.c:56
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Щоб дізнатися більше, віддайте команду «%s --help».\n"
@@ -3763,7 +3779,7 @@ msgstr "guestfs_create: не вдалося створити елемент ке
#: cat/filesystems.c:239 cat/log.c:140 cat/ls.c:228 df/main.c:155
#: diff/diff.c:261 edit/edit.c:155 fish/fish.c:291 format/format.c:181
#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
-#: make-fs/make-fs.c:142 p2v/main.c:129 rescue/rescue.c:190
+#: make-fs/make-fs.c:142 p2v/main.c:126 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: невідомий довгий запис параметра: %s (%d)\n"
@@ -4652,12 +4668,12 @@ msgid "enable or disable the seeding feature of device"
msgstr "увімкнути або вимкнути можливість поширення даних з пристрою"
#: fish/cmds.c:3864
-msgid "create a btrfs snapshot"
-msgstr "створити знімок btrfs"
+msgid "create a btrfs subvolume"
+msgstr ""
#: fish/cmds.c:3865
-msgid "delete a btrfs snapshot"
-msgstr "вилучити знімок btrfs"
+msgid "delete a btrfs subvolume or snapshot"
+msgstr ""
#: fish/cmds.c:3866
msgid "list btrfs snapshots and subvolumes"
@@ -8060,37 +8076,37 @@ msgstr "%s: xmlOutputBufferCreateFd: не вдалося відкрити stdout
msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
msgstr "%s: xmlNewTextWriter: не вдалося створити процес запису libxml2\n"
-#: inspector/inspector.c:769
+#: inspector/inspector.c:771
#, c-format
msgid "%s: unable to parse XML from stdin\n"
msgstr "%s: не вдалося обробити код XML з stdin\n"
-#: inspector/inspector.c:775
+#: inspector/inspector.c:777
#, c-format
msgid "%s: unable to create new XPath context\n"
msgstr "%s: не вдалося створити контекст XPath\n"
-#: inspector/inspector.c:782
+#: inspector/inspector.c:784
#, c-format
msgid "%s: unable to evaluate XPath expression\n"
msgstr "%s: не вдалося обробити вираз XPath\n"
-#: inspector/inspector.c:795
+#: inspector/inspector.c:797
#, c-format
msgid "%s: xmlSaveToFd failed\n"
msgstr "%s: помилка xmlSaveToFd\n"
-#: inspector/inspector.c:802
+#: inspector/inspector.c:804
#, c-format
msgid "%s: xmlNewDoc failed\n"
msgstr "%s: помилка xmlNewDoc\n"
-#: inspector/inspector.c:807
+#: inspector/inspector.c:809
#, c-format
msgid "%s: xmlCopyNode failed\n"
msgstr "%s: помилка xmlCopyNode\n"
-#: inspector/inspector.c:814
+#: inspector/inspector.c:816
#, c-format
msgid "%s: xmlSaveDoc failed\n"
msgstr "%s: помилка xmlSaveDoc\n"
@@ -8180,80 +8196,80 @@ msgstr "%s: %s: некоректний параметр розміру «%s» (%
msgid "%s: subprocess failed\n"
msgstr "%s: помилка підпроцесу\n"
-#: p2v/conversion.c:119
+#: p2v/conversion.c:121
#, c-format
msgid "Opening data connection for %s ..."
msgstr "Відкриваємо з’єднання для обміну даними для %s…"
-#: p2v/conversion.c:197
+#: p2v/conversion.c:199
msgid "Setting up the control connection ..."
msgstr "Налаштовуємо контрольне з’єднання…"
-#: p2v/conversion.c:209
+#: p2v/conversion.c:211
msgid "Doing conversion ..."
msgstr "Виконуємо перетворення…"
-#: p2v/conversion.c:294
+#: p2v/conversion.c:301
msgid "Control connection closed by remote."
msgstr "З’єднання керування розірвано на віддаленому боці."
-#: p2v/gui.c:114
+#: p2v/gui.c:116
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
"Встановити з’єднання із сервером перетворення virt-v2v за допомогою SSH:"
-#: p2v/gui.c:119
+#: p2v/gui.c:121
msgid "Conversion server:"
msgstr "Сервер перетворення:"
-#: p2v/gui.c:129
+#: p2v/gui.c:131
msgid "SSH port:"
msgstr "Порт SSH:"
-#: p2v/gui.c:140
+#: p2v/gui.c:142
msgid "User name:"
msgstr "Користувач:"
-#: p2v/gui.c:152
+#: p2v/gui.c:154
msgid "Password:"
msgstr "Пароль:"
-#: p2v/gui.c:168
+#: p2v/gui.c:170
msgid "Use sudo when running virt-v2v"
msgstr "Використовувати sudo для запуску virt-v2v"
-#: p2v/gui.c:175
+#: p2v/gui.c:177
msgid "Test connection"
msgstr "Перевірка з'єднання"
-#: p2v/gui.c:198
+#: p2v/gui.c:200
msgid "virt-p2v "
msgstr "virt-p2v "
-#: p2v/gui.c:199
+#: p2v/gui.c:201
msgid "Next"
msgstr "Далі"
-#: p2v/gui.c:249
+#: p2v/gui.c:251
msgid "error: No conversion server given."
msgstr "помилка: не вказано сервер перетворення."
-#: p2v/gui.c:257
+#: p2v/gui.c:259
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
"помилка: некоректний номер порту. Якщо не знаєте, що вибрати, вкажіть «22»."
-#: p2v/gui.c:265
+#: p2v/gui.c:267
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
"помилка: не вказано імені користувача. Якщо не знаєте, що вказати, вкажіть "
"«root»."
-#: p2v/gui.c:306
+#: p2v/gui.c:308
msgid "Testing the connection to the conversion server ..."
msgstr "Перевіряємо з’єднання із сервером перетворення…"
-#: p2v/gui.c:325
+#: p2v/gui.c:327
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
@@ -8261,31 +8277,31 @@ msgstr ""
"Встановлено з’єднання із сервером перетворення.\n"
"Натисніть кнопку «Далі», щоб налаштувати процедуру перетворення."
-#: p2v/gui.c:428
+#: p2v/gui.c:430
msgid "Target properties"
msgstr "Властивості цілі"
-#: p2v/gui.c:434
+#: p2v/gui.c:436
msgid "Name:"
msgstr "Назва:"
-#: p2v/gui.c:444
+#: p2v/gui.c:446
msgid "# vCPUs:"
msgstr "К-ть вірт. проц.:"
-#: p2v/gui.c:454
+#: p2v/gui.c:456
msgid "Memory (MB):"
msgstr "Пам’ять (МБ):"
-#: p2v/gui.c:468
+#: p2v/gui.c:470
msgid "Virt-v2v output options"
msgstr "Параметри виведення virt-v2v"
-#: p2v/gui.c:474
+#: p2v/gui.c:476
msgid "Output to (-o):"
msgstr "Виводити до (-o):"
-#: p2v/gui.c:479
+#: p2v/gui.c:481
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -8300,11 +8316,11 @@ msgstr ""
"запису системи до OpenStack Glance. Див. сторінку підручника (man) virt-"
"v2v(1), щоб дізнатися більше про параметри виведення даних."
-#: p2v/gui.c:484
+#: p2v/gui.c:486
msgid "Output conn. (-oc):"
msgstr "З’єднання виведення (-oc):"
-#: p2v/gui.c:489
+#: p2v/gui.c:491
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
@@ -8314,11 +8330,11 @@ msgstr ""
"слід додати гостьову систему до типового екземпляра libvirt на сервері "
"перетворення. Для інших варіантів це поле слід залишити порожнім."
-#: p2v/gui.c:495
+#: p2v/gui.c:497
msgid "Output storage (-os):"
msgstr "Сховище виведення (-os):"
-#: p2v/gui.c:500
+#: p2v/gui.c:502
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
@@ -8328,11 +8344,11 @@ msgstr ""
"<b>rhev</b>, вказати домен сховища для експортування (сервер:/точка "
"монтування). Для інших варіантів, не заповнюйте це поле."
-#: p2v/gui.c:506
+#: p2v/gui.c:508
msgid "Output format (-of):"
msgstr "Формат виведення (-of):"
-#: p2v/gui.c:511
+#: p2v/gui.c:513
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
@@ -8340,11 +8356,11 @@ msgstr ""
"Формат диска виведення даних, типово <b>raw</b> або <b>qcow2</b>. Якщо "
"порожнє, типовим значенням вважається <b>raw</b>."
-#: p2v/gui.c:517
+#: p2v/gui.c:519
msgid "Output allocation (-oa):"
msgstr "Розташовування виведення (-oa):"
-#: p2v/gui.c:536
+#: p2v/gui.c:538
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
@@ -8352,36 +8368,36 @@ msgstr ""
"Увімкнути діагностику на боці сервера\n"
"(Дані зберігаються у каталозі /tmp сервера перетворення)"
-#: p2v/gui.c:545
+#: p2v/gui.c:547
msgid "Information"
msgstr "Інформація"
-#: p2v/gui.c:553
+#: p2v/gui.c:555
msgid "Fixed hard disks"
msgstr "Стаціонарні жорсткі диски"
-#: p2v/gui.c:565
+#: p2v/gui.c:567
msgid "Removable media"
msgstr "Портативний носій"
-#: p2v/gui.c:577
+#: p2v/gui.c:579
msgid "Network interfaces"
msgstr "Мережеві інтерфейси"
-#: p2v/gui.c:605
+#: p2v/gui.c:607
msgid "Back"
msgstr "Назад"
-#: p2v/gui.c:606
+#: p2v/gui.c:608
msgid "Start conversion"
msgstr "Розпочати перетворення"
-#: p2v/gui.c:642
+#: p2v/gui.c:644
#, c-format
msgid "virt-p2v (client) %s"
msgstr "virt-p2v (клієнт) %s"
-#: p2v/gui.c:645
+#: p2v/gui.c:647
#, c-format
msgid ""
"virt-p2v (client) %s\n"
@@ -8390,31 +8406,35 @@ msgstr ""
"virt-p2v (клієнт) %s\n"
"virt-v2v (сервер перетворення) %d.%d.%d"
-#: p2v/gui.c:768 p2v/gui.c:823 p2v/gui.c:871
+#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
msgid "Convert"
msgstr "Перетворити"
-#: p2v/gui.c:775 p2v/gui.c:830 p2v/gui.c:878
+#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
msgid "Device"
msgstr "Пристрій"
-#: p2v/gui.c:782
+#: p2v/gui.c:784
msgid "Size (GB)"
msgstr "Розмір (ГБ)"
-#: p2v/gui.c:789
+#: p2v/gui.c:791
msgid "Model"
msgstr "Модель"
-#: p2v/gui.c:885
+#: p2v/gui.c:887
msgid "Connect to virtual network"
msgstr "Встановити з’єднання із віртуальною мережею"
-#: p2v/gui.c:1094
+#: p2v/gui.c:1098
msgid "Cancel conversion"
msgstr "Скасувати перетворення"
-#: p2v/gui.c:1122
+#: p2v/gui.c:1099
+msgid "Reboot"
+msgstr ""
+
+#: p2v/gui.c:1134
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -8425,15 +8445,15 @@ msgstr ""
"цього каталогу:\n"
"%s"
-#: p2v/gui.c:1183
+#: p2v/gui.c:1195
msgid "The guest \"Name\" field is empty."
msgstr "Порожнє поле «Назва» гостьової системи."
-#: p2v/gui.c:1184 p2v/gui.c:1217
+#: p2v/gui.c:1196 p2v/gui.c:1229
msgid "Error"
msgstr "Помилка"
-#: p2v/gui.c:1215
+#: p2v/gui.c:1227
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
@@ -8441,24 +8461,24 @@ msgstr ""
"Не вказано дисків для перетворення.\n"
"Слід вказати принаймні один стаціонарний жорсткий диск.\n"
-#: p2v/gui.c:1302
+#: p2v/gui.c:1314
#, c-format
msgid "Conversion failed: %s"
msgstr "Помилка під час перетворення: %s"
-#: p2v/gui.c:1303
+#: p2v/gui.c:1315
msgid "Conversion failed"
msgstr "Перетворення не вдалося"
-#: p2v/gui.c:1312
+#: p2v/gui.c:1324
msgid "The conversion was successful."
msgstr "Перетворення виконано успішно."
-#: p2v/gui.c:1313
+#: p2v/gui.c:1325
msgid "Conversion was successful"
msgstr "Успішне перетворення"
-#: p2v/main.c:71
+#: p2v/main.c:69
#, c-format
msgid ""
"%s: Convert a physical machine to use KVM\n"
@@ -8468,24 +8488,12 @@ msgid ""
"Options:\n"
" --help Display brief help\n"
" --cmdline=CMDLINE Used to debug command line parsing\n"
-" --fullscreen Run virt-p2v in full screen mode\n"
" -v|--verbose Verbose messages\n"
" -V|--version Display version and exit\n"
"For more information, see the manpage %s(1).\n"
msgstr ""
-"%s: перетворення фізичної машини для використання у KVM\n"
-"© Red Hat Inc., 2009–2014\n"
-"Користування:\n"
-" %s [--параметри]\n"
-"Параметри:\n"
-" --help вивести коротку довідку\n"
-" --cmdline=РЯДОК скористатися засобом діагностики рядка команди\n"
-" --fullscreen запустити virt-p2v у повноекранному режимі\n"
-" -v|--verbose режим докладних повідомлень\n"
-" -V|--version вивести дані щодо версії і завершити роботу\n"
-"Докладніший опис можна знайти на сторінці man %s(1).\n"
-#: p2v/main.c:152
+#: p2v/main.c:149
#, c-format
msgid "%s: unused arguments on the command line\n"
msgstr "%s: невикористані аргументи у командному рядку\n"
@@ -9296,7 +9304,7 @@ msgstr "розмір %s неймовірно великий (%<PRIi64> байт
msgid "could not parse integer in version number: %s"
msgstr "не вдалося обробити ціле число у номері версії: %s"
-#: src/inspect-icon.c:634
+#: src/inspect-icon.c:646
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "читання: %s: неочікуваний кінець файла"
@@ -10165,6 +10173,37 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
+#~ msgid "create a btrfs snapshot"
+#~ msgstr "створити знімок btrfs"
+
+#~ msgid "delete a btrfs snapshot"
+#~ msgstr "вилучити знімок btrfs"
+
+#~ msgid ""
+#~ "%s: Convert a physical machine to use KVM\n"
+#~ "Copyright (C) 2009-2014 Red Hat Inc.\n"
+#~ "Usage:\n"
+#~ " %s [--options]\n"
+#~ "Options:\n"
+#~ " --help Display brief help\n"
+#~ " --cmdline=CMDLINE Used to debug command line parsing\n"
+#~ " --fullscreen Run virt-p2v in full screen mode\n"
+#~ " -v|--verbose Verbose messages\n"
+#~ " -V|--version Display version and exit\n"
+#~ "For more information, see the manpage %s(1).\n"
+#~ msgstr ""
+#~ "%s: перетворення фізичної машини для використання у KVM\n"
+#~ "© Red Hat Inc., 2009–2014\n"
+#~ "Користування:\n"
+#~ " %s [--параметри]\n"
+#~ "Параметри:\n"
+#~ " --help вивести коротку довідку\n"
+#~ " --cmdline=РЯДОК скористатися засобом діагностики рядка команди\n"
+#~ " --fullscreen запустити virt-p2v у повноекранному режимі\n"
+#~ " -v|--verbose режим докладних повідомлень\n"
+#~ " -V|--version вивести дані щодо версії і завершити роботу\n"
+#~ "Докладніший опис можна знайти на сторінці man %s(1).\n"
+
#~ msgid ""
#~ "esx: URI (-ic parameter) contains no path, so we cannot determine the "
#~ "datacenter name"
--
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