[Pkg-libvirt-commits] [libguestfs] 76/179: Version 1.27.63.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 31 19:08:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 93c2769e2bb6a19b216d78216d062e4d99f43dbf
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Oct 15 22:19:19 2014 +0200
Version 1.27.63.
---
BUGS | 144 ++++++++++++++++++++++++++------------------
configure.ac | 2 +-
po-docs/ja.po | 16 +++--
po-docs/libguestfs-docs.pot | 11 +---
po-docs/uk.po | 16 +++--
po/en_GB.po | 104 +++++++++++++++++---------------
po/es.po | 104 +++++++++++++++++---------------
po/gu.po | 104 +++++++++++++++++---------------
po/hi.po | 104 +++++++++++++++++---------------
po/kn.po | 104 +++++++++++++++++---------------
po/libguestfs.pot | 106 ++++++++++++++++----------------
po/ml.po | 104 +++++++++++++++++---------------
po/mr.po | 104 +++++++++++++++++---------------
po/nl.po | 104 +++++++++++++++++---------------
po/or.po | 104 +++++++++++++++++---------------
po/pa.po | 104 +++++++++++++++++---------------
po/pl.po | 104 +++++++++++++++++---------------
po/ta.po | 104 +++++++++++++++++---------------
po/te.po | 104 +++++++++++++++++---------------
po/uk.po | 104 +++++++++++++++++---------------
20 files changed, 913 insertions(+), 838 deletions(-)
diff --git a/BUGS b/BUGS
index f3d8f69..827d86b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-10-10
+Last updated: 2014-10-15
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -416,6 +416,60 @@ 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
+
+1151897 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151897
+ virt-ls --checksum: checksum for soft link is wrong, the soft link have no checksum value output
+
+1151898 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151898
+ virt-ls --checksum: checksum for soft link is wrong, the soft link have no checksum value output
+
+1151901 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151901
+ Should also add a field for directory files when run virt-ls with --csv option
+
+1151902 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151902
+ virt-v2v:Network interface disappear after conversion of guest with interface type direct
+
+1151903 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151903
+ virt tools --csv output should have a meaningful output
+
+1151905 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151905
+ virt tools --csv output should have a meaningful output
+
+1151911 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151911
+ virt-ls should remove '/' in the output when specify the directory name as /etc/
+
+1152369 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152369
+ [RFE]virt-v2v failed to convert guest with UEFI firmware
+
+1152533 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152533
+ virt-v2v fail to convert guest with virtio lun disk
+
+1152818 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152818
+ llz give ? for the security context of a file, which is wrong
+
+1152819 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152819
+ Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue
+
+1152821 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152821
+ Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue
+
+1152825 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152825
+ virt-rescue --selinux can not work well, when enable selinux in the command line the value of 'getenforce' is still Disabled in virt-rescue appliance
+
+1152832 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152832
+ virt-rescue --selinux can not work well, when enable selinux in the command line the value of 'getenforce' is still Disabled in virt-rescue appliance
+
+1152833 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152833
+ llz give ? for the security context of a file, which is wrong
+
+1152998 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1152998
+ virt-v2v / qemu-img fails on ova image
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -446,7 +500,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1145916 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1145916
virt-v2v fails to convert win7 guest
-(142 bugs)
+(160 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -458,18 +512,27 @@ 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
-1151033 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151033
- virt-v2v conversions from VMware vCenter server run slowly
+1151738 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151738
+ typo error in man page of virt-edit
+
+1151766 POST 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
+
+1151900 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151900
+ Should also add a field for directory files when run virt-ls with --csv option
+
+1151910 POST https://bugzilla.redhat.com/show_bug.cgi?id=1151910
+ virt-ls should remove '/' in the output when specify the directory name as /etc/
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
-1140946 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1140946
- qemu-img shows error message for backing file twice
-
1150701 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150701
virt-v2v does not fstrim data disks and non-mounted filesystems
+1151033 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1151033
+ virt-v2v conversions from VMware vCenter server run slowly
+
805417 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=805417
RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
@@ -482,12 +545,6 @@ You can help by testing the fixes.
1028676 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1028676
Add virt-builder to RHEL 7.1
-1041552 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1041552
- virt-sysprep should remove Pegasus certificates
-
-1042780 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1042780
- Support the virt-sysprep --delete option
-
1073917 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1073917
java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:
@@ -512,6 +569,9 @@ You can help by testing the fixes.
1140894 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140894
No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
+1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
+ qemu-img shows error message for backing file twice
+
1141145 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1141145
virt-v2v fails to convert xen pv guests.
@@ -545,62 +605,20 @@ 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
-1150815 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1150815
- Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
-
-1150867 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1150867
- 'copy-file-to-file /src /dest' create file /dest even if command 'copy-file-to-file /src /dest' failed
-
(33 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
-624335 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=624335
- blockdev-setbsz succeeds, but does not affect blockdev-getbsz
-
-965495 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=965495
- New APIs required in libguestfs for virt-v2v in RHEL 6.5
-
-982979 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=982979
- Disable fstrim API/command in RHEL 6
-
-1025269 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1025269
- libguestfs tests hang in libguestfs-1.20.11/tests/guests/guest-aux/make-fedora-img.pl
-
-1056558 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1056558
- virt-sparsify overwrites block devices if used as output files
-
-1057510 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1057510
- mount-local should give a clearer error if root is not mounted
-
-1072062 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1072062
- Ruby bindings for libguestfs throws an error periodically
-
-1079182 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1079182
- virt-df cannot report used disk space of windows guest when updated to 6.5
-
-1091805 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1091805
- tar-in-opts execute failed that cause libguestfs appliance crashed
-
-1097359 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1097359
- virt-sparsify hangs with 'No space left on device' while filling LV
+1041552 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1041552
+ virt-sysprep should remove Pegasus certificates
-1099105 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099105
- libguestfs Requires: /lib64/libldif-2.4.so.2 missing from openldap-2.4.39-6.el6.x86_64
+1042780 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1042780
+ Support the virt-sysprep --delete option
1099284 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099284
typo errors in man pages
-1099332 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1099332
- typo errors in man pages
-
-1106548 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1106548
- root gets an error accessing to a non-root dir on a snapshot guestmount VMDK img
-
-1117540 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1117540
- Support virt-sparsify option to allow specifying temporary file or block device
-
1136739 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1136739
virt-v2v warning info should be printed to fill the whole line
@@ -673,9 +691,15 @@ These bugs are in the VERIFIED state.
1150475 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150475
Exporting 2+ disk guest to RHEV, only one disk shows after import
+1150815 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150815
+ Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
+
+1150867 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150867
+ 'copy-file-to-file /src /dest' create file /dest even if command 'copy-file-to-file /src /dest' failed
+
1150880 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1150880
virt-v2v: warning: display <graphics type='sdl'> was ignored when converting rhel5 guest with sdl graphics
-(40 bugs)
+(30 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 49e1646..2371bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [27])
-m4_define([libguestfs_release], [62])
+m4_define([libguestfs_release], [63])
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 e05e503..7688d07 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-10-10 16:57+0200\n"
+"POT-Creation-Date: 2014-10-15 22:18+0300\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -590,9 +590,9 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:141 ../cat/virt-cat.pod:100
#: ../cat/virt-filesystems.pod:174 ../cat/virt-log.pod:83
#: ../cat/virt-ls.pod:322 ../df/virt-df.pod:119 ../diff/virt-diff.pod:138
-#: ../fish/guestfish.pod:234 ../format/virt-format.pod:91
-#: ../fuse/guestmount.pod:222 ../inspector/virt-inspector.pod:96
-#: ../rescue/virt-rescue.pod:159
+#: ../edit/virt-edit.pod:138 ../fish/guestfish.pod:234
+#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:222
+#: ../inspector/virt-inspector.pod:96 ../rescue/virt-rescue.pod:159
msgid "B<--format=raw|qcow2|..>"
msgstr "B<--format=raw|qcow2|..>"
@@ -9667,11 +9667,6 @@ msgstr ""
"外部エディターを起動する代わりに、ファイルにある各行に対して非対話的に Perl "
"表現 C<EXPR> を適用します。以下の L</非対話的な編集方法> を参照してください。"
-#. type: =item
-#: ../edit/virt-edit.pod:138
-msgid "B<--format> raw|qcow2|..."
-msgstr "B<--format> raw|qcow2|..."
-
#. type: verbatim
#: ../edit/virt-edit.pod:149
#, no-wrap
@@ -92109,3 +92104,6 @@ msgstr ""
#: ../v2v/virt-v2v.pod:1284
msgid "Tingting Zheng"
msgstr ""
+
+#~ msgid "B<--format> raw|qcow2|..."
+#~ msgstr "B<--format> raw|qcow2|..."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index ba036a7..2390973 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.62\n"
+"Project-Id-Version: libguestfs 1.27.63\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-10-10 16:57+0200\n"
+"POT-Creation-Date: 2014-10-15 22:18+0300\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"
@@ -339,7 +339,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:141 ../cat/virt-cat.pod:100 ../cat/virt-filesystems.pod:174 ../cat/virt-log.pod:83 ../cat/virt-ls.pod:322 ../df/virt-df.pod:119 ../diff/virt-diff.pod:138 ../fish/guestfish.pod:234 ../format/virt-format.pod:91 ../fuse/guestmount.pod:222 ../inspector/virt-inspector.pod:96 ../rescue/virt-rescue.pod:159
+#: ../align/virt-alignment-scan.pod:141 ../cat/virt-cat.pod:100 ../cat/virt-filesystems.pod:174 ../cat/virt-log.pod:83 ../cat/virt-ls.pod:322 ../df/virt-df.pod:119 ../diff/virt-diff.pod:138 ../edit/virt-edit.pod:138 ../fish/guestfish.pod:234 ../format/virt-format.pod:91 ../fuse/guestmount.pod:222 ../inspector/virt-inspector.pod:96 ../rescue/virt-rescue.pod:159
msgid "B<--format=raw|qcow2|..>"
msgstr ""
@@ -8263,11 +8263,6 @@ msgid ""
"EDITING> below."
msgstr ""
-#. type: =item
-#: ../edit/virt-edit.pod:138
-msgid "B<--format> raw|qcow2|..."
-msgstr ""
-
#. type: verbatim
#: ../edit/virt-edit.pod:149
#, no-wrap
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 4b82663..f3fc829 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-10-10 16:57+0200\n"
+"POT-Creation-Date: 2014-10-15 22:18+0300\n"
"PO-Revision-Date: 2014-10-07 12:24+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -591,9 +591,9 @@ msgstr ""
#: ../align/virt-alignment-scan.pod:141 ../cat/virt-cat.pod:100
#: ../cat/virt-filesystems.pod:174 ../cat/virt-log.pod:83
#: ../cat/virt-ls.pod:322 ../df/virt-df.pod:119 ../diff/virt-diff.pod:138
-#: ../fish/guestfish.pod:234 ../format/virt-format.pod:91
-#: ../fuse/guestmount.pod:222 ../inspector/virt-inspector.pod:96
-#: ../rescue/virt-rescue.pod:159
+#: ../edit/virt-edit.pod:138 ../fish/guestfish.pod:234
+#: ../format/virt-format.pod:91 ../fuse/guestmount.pod:222
+#: ../inspector/virt-inspector.pod:96 ../rescue/virt-rescue.pod:159
msgid "B<--format=raw|qcow2|..>"
msgstr "B<--format=raw|qcow2|..>"
@@ -9708,11 +9708,6 @@ msgid ""
"EDITING> below."
msgstr ""
-#. type: =item
-#: ../edit/virt-edit.pod:138
-msgid "B<--format> raw|qcow2|..."
-msgstr "B<--format> raw|qcow2|..."
-
#. type: verbatim
#: ../edit/virt-edit.pod:149
#, no-wrap
@@ -91148,3 +91143,6 @@ msgstr ""
#: ../v2v/virt-v2v.pod:1284
msgid "Tingting Zheng"
msgstr ""
+
+#~ msgid "B<--format> raw|qcow2|..."
+#~ msgstr "B<--format> raw|qcow2|..."
diff --git a/po/en_GB.po b/po/en_GB.po
index ef87371..5407836 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/es.po b/po/es.po
index 4302ff2..c337567 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,11 +67,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -111,7 +111,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -540,7 +540,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -830,10 +830,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1050,6 +1046,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1097,17 +1099,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1265,7 +1263,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1489,6 +1487,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2093,15 +2099,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2296,7 +2298,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2320,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2421,12 +2427,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2439,8 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2477,11 +2481,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2501,15 +2505,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2599,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2627,11 +2631,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2651,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2710,7 +2714,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2815,7 +2819,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2909,7 +2913,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/gu.po b/po/gu.po
index bef0f2f..5192631 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,11 +66,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -829,10 +829,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1049,6 +1045,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1096,17 +1098,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1264,7 +1262,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1488,6 +1486,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2092,15 +2098,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2295,7 +2297,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2319,11 +2325,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2420,12 +2426,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2438,8 +2438,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2476,11 +2480,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2500,15 +2504,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2520,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2598,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2626,11 +2630,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2650,7 +2654,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2695,7 +2699,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2709,7 +2713,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2814,7 +2818,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2908,7 +2912,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/hi.po b/po/hi.po
index 010cda8..ef1ef6b 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,11 +66,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -829,10 +829,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1049,6 +1045,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1096,17 +1098,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1264,7 +1262,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1488,6 +1486,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2092,15 +2098,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2295,7 +2297,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2319,11 +2325,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2420,12 +2426,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2438,8 +2438,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2476,11 +2480,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2500,15 +2504,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2520,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2598,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2626,11 +2630,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2650,7 +2654,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2695,7 +2699,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2709,7 +2713,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2814,7 +2818,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2908,7 +2912,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/kn.po b/po/kn.po
index 294201a..ab1760e 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 41dc953..80f4a6d 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.62\n"
+"Project-Id-Version: libguestfs 1.27.63\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -64,11 +64,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -100,7 +100,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -108,7 +108,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -273,7 +273,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -537,7 +537,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -827,10 +827,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1047,6 +1043,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1094,17 +1096,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1262,7 +1260,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1486,6 +1484,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2090,15 +2096,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2293,7 +2295,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2317,11 +2323,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2418,12 +2424,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2436,8 +2436,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2474,11 +2478,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2498,15 +2502,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2518,7 +2522,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2596,15 +2600,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2624,11 +2628,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2648,7 +2652,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2693,7 +2697,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2707,7 +2711,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2812,7 +2816,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2906,7 +2910,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/ml.po b/po/ml.po
index 0b787c0..3e6c223 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/mr.po b/po/mr.po
index 9feff5b..689c1a1 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -66,11 +66,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -829,10 +829,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1049,6 +1045,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1096,17 +1098,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1264,7 +1262,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1488,6 +1486,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2092,15 +2098,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2295,7 +2297,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2319,11 +2325,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2420,12 +2426,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2438,8 +2438,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2476,11 +2480,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2500,15 +2504,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2520,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2598,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2626,11 +2630,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2650,7 +2654,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2695,7 +2699,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2709,7 +2713,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2814,7 +2818,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2908,7 +2912,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/nl.po b/po/nl.po
index 60e2e63..fec0299 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,11 +67,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -111,7 +111,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -540,7 +540,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -830,10 +830,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1050,6 +1046,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1097,17 +1099,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1265,7 +1263,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1489,6 +1487,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2093,15 +2099,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2296,7 +2298,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2320,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2421,12 +2427,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2439,8 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2477,11 +2481,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2501,15 +2505,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2599,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2627,11 +2631,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2651,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2710,7 +2714,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2815,7 +2819,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2909,7 +2913,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/or.po b/po/or.po
index 1965754..c5f4058 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/pa.po b/po/pa.po
index e77e021..6772218 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -66,11 +66,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -102,7 +102,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -539,7 +539,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -829,10 +829,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1049,6 +1045,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1096,17 +1098,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1264,7 +1262,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1488,6 +1486,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2092,15 +2098,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2295,7 +2297,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2319,11 +2325,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2420,12 +2426,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2438,8 +2438,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2476,11 +2480,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2500,15 +2504,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2520,7 +2524,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2598,15 +2602,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2626,11 +2630,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2650,7 +2654,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2695,7 +2699,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2709,7 +2713,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2814,7 +2818,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2908,7 +2912,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/pl.po b/po/pl.po
index 8d508e8..efbbc0b 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,11 +69,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -105,7 +105,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -832,10 +832,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1052,6 +1048,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1099,17 +1101,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1267,7 +1265,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1491,6 +1489,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2095,15 +2101,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2298,7 +2300,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2322,11 +2328,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2423,12 +2429,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2441,8 +2441,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2479,11 +2483,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2503,15 +2507,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2523,7 +2527,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2601,15 +2605,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2629,11 +2633,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2653,7 +2657,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2698,7 +2702,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2712,7 +2716,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2817,7 +2821,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2911,7 +2915,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/ta.po b/po/ta.po
index 7e3b56f..06dbf0c 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/te.po b/po/te.po
index 2935862..24ada51 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -65,11 +65,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -101,7 +101,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -538,7 +538,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -828,10 +828,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1048,6 +1044,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1095,17 +1097,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1263,7 +1261,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1487,6 +1485,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2091,15 +2097,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2294,7 +2296,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2318,11 +2324,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2419,12 +2425,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2437,8 +2437,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2475,11 +2479,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2499,15 +2503,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2519,7 +2523,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2597,15 +2601,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2625,11 +2629,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2649,7 +2653,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2694,7 +2698,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2708,7 +2712,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2813,7 +2817,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2907,7 +2911,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
diff --git a/po/uk.po b/po/uk.po
index c3ae564..00bb4ce 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-10-10 16:57+0100\n"
+"POT-Creation-Date: 2014-10-15 22:17+0200\n"
"PO-Revision-Date: 2014-10-07 12:23+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -67,11 +67,11 @@ msgid ""
"guest to partition this extra space if you want."
msgstr ""
-#: ../mllib/common_utils.ml:272
+#: ../mllib/common_utils.ml:284
msgid "%s"
msgstr ""
-#: ../v2v/v2v.ml:586 ../v2v/v2v.ml:475
+#: ../v2v/v2v.ml:595 ../v2v/v2v.ml:484
msgid "%s (ignored)"
msgstr ""
@@ -103,7 +103,7 @@ msgid ""
"manually after conversion."
msgstr ""
-#: ../mllib/common_utils.ml:268
+#: ../mllib/common_utils.ml:280 ../mllib/common_utils.ml:267
msgid "%s: %s"
msgstr ""
@@ -111,7 +111,7 @@ msgstr ""
msgid "%s: %s (ignored)\n"
msgstr ""
-#: ../mllib/common_utils.ml:270
+#: ../mllib/common_utils.ml:282
msgid "%s: %s: %s"
msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
msgid "%s: empty --expand option"
msgstr ""
-#: ../mllib/common_utils.ml:239
+#: ../mllib/common_utils.ml:241
msgid "%s: error: %s"
msgstr ""
@@ -540,7 +540,7 @@ msgstr ""
msgid "%s: virt-resize is not installed (or does not work)\n"
msgstr ""
-#: ../mllib/common_utils.ml:255
+#: ../mllib/common_utils.ml:257
msgid "%s: warning: %s"
msgstr ""
@@ -830,10 +830,6 @@ msgstr ""
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
-#: ../v2v/input_ova.ml:74
-msgid "Checksum of %s does not match manifest sha1 %s"
-msgstr ""
-
#: ../sparsify/in_place.ml:104 ../sparsify/copying.ml:250
msgid ""
"Clearing Linux swap on %s ...\n"
@@ -1050,6 +1046,12 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
+#: ../v2v/v2v.ml:420
+msgid ""
+"Dual- or multi-boot operating system detected. Choose the root filesystem\n"
+"that contains the main operating system from the list below:\n"
+msgstr ""
+
#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
@@ -1097,17 +1099,13 @@ msgid "Enable/disable specific operations"
msgstr ""
#: ../v2v/v2v.ml:433
-msgid "Enter number between 1 and %d: "
+msgid "Enter a number between 1 and %d, or 'exit': "
msgstr ""
#: ../builder/downloader.ml:76
msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
msgstr ""
-#: ../v2v/input_ova.ml:141
-msgid "Error parsing disk fileRef"
-msgstr ""
-
#: ../v2v/v2v.ml:226
msgid "Estimating space required on target for each disk"
msgstr ""
@@ -1265,7 +1263,7 @@ msgstr ""
msgid "How to choose root filesystem"
msgstr ""
-#: ../mllib/common_utils.ml:243
+#: ../mllib/common_utils.ml:245
msgid ""
"If reporting bugs, run %s with debugging enabled and include the complete "
"output:\n"
@@ -1489,6 +1487,14 @@ msgstr ""
msgid "Perform a dry run"
msgstr ""
+#: ../v2v/v2v.ml:460
+msgid "Picked %s because '--root %s' was used."
+msgstr ""
+
+#: ../v2v/v2v.ml:451
+msgid "Picked %s because '--root first' was used."
+msgstr ""
+
#: ../builder/builder.ml:481
msgid "Planning how to build this image"
msgstr ""
@@ -2093,15 +2099,11 @@ msgid ""
msgstr ""
#: ../v2v/v2v.ml:256
-msgid ""
-"This guest does not have virtio drivers installed.\n"
-"%!"
+msgid "This guest does not have virtio drivers installed."
msgstr ""
#: ../v2v/v2v.ml:254
-msgid ""
-"This guest has virtio drivers installed.\n"
-"%!"
+msgid "This guest has virtio drivers installed."
msgstr ""
#: ../v2v/OVF.ml:295
@@ -2296,7 +2298,11 @@ msgid ""
"v2v (^C) and rerun it as root."
msgstr ""
-#: ../v2v/v2v.ml:436
+#: ../v2v/input_ova.ml:73
+msgid "checksum of %s does not match manifest sha1 %s"
+msgstr ""
+
+#: ../v2v/v2v.ml:440
msgid "connection closed"
msgstr ""
@@ -2320,11 +2326,11 @@ msgstr ""
msgid "could not parse '-ic %s'. Original error message was: %s"
msgstr ""
-#: ../v2v/input_ova.ml:147
+#: ../v2v/input_ova.ml:164
msgid "could not parse disk rasd:HostResource from OVF document"
msgstr ""
-#: ../v2v/input_ova.ml:165
+#: ../v2v/input_ova.ml:116
msgid "could not parse ovf:Name from OVF document"
msgstr ""
@@ -2421,12 +2427,6 @@ msgstr ""
msgid "don't know how to update %s which loads the %s module"
msgstr ""
-#: ../v2v/v2v.ml:420
-msgid ""
-"dual- or multi-boot operating system detected. Choose the root filesystem\n"
-"that contains the main operating system from the list below:\n"
-msgstr ""
-
#: ../sysprep/sysprep_operation.ml:131
msgid "duplicate operation name (%s)"
msgstr ""
@@ -2439,8 +2439,12 @@ msgstr ""
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
-#: ../v2v/input_ova.ml:44
-msgid "error running command: %s"
+#: ../v2v/input_ova.ml:154
+msgid "error parsing disk fileRef"
+msgstr ""
+
+#: ../v2v/input_ova.ml:43
+msgid "error unpacking OVA file: %s"
msgstr ""
#: ../v2v/vCenter.ml:120
@@ -2477,11 +2481,11 @@ msgstr ""
msgid "esx: no status code in output of 'curl' command. Is 'curl' installed?"
msgstr ""
-#: ../mllib/common_utils.ml:285
+#: ../mllib/common_utils.ml:297
msgid "exception: %s"
msgstr ""
-#: ../v2v/input_ova.ml:102 ../v2v/input_libvirtxml.ml:55
+#: ../v2v/input_ova.ml:107 ../v2v/input_libvirtxml.ml:55
msgid "expecting XML expression to return an integer (expression: %s)"
msgstr ""
@@ -2501,15 +2505,15 @@ msgstr ""
msgid "expecting an OVA file name on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:457
+#: ../mllib/common_utils.ml:469
msgid "external command '%s' exited with error %d"
msgstr ""
-#: ../mllib/common_utils.ml:459
+#: ../mllib/common_utils.ml:471
msgid "external command '%s' killed by signal %d"
msgstr ""
-#: ../mllib/common_utils.ml:461
+#: ../mllib/common_utils.ml:473
msgid "external command '%s' stopped by signal %d"
msgstr ""
@@ -2521,7 +2525,7 @@ msgstr ""
msgid "extra parameter on the command line"
msgstr ""
-#: ../mllib/common_utils.ml:276
+#: ../mllib/common_utils.ml:288
msgid "failure: %s"
msgstr ""
@@ -2599,15 +2603,15 @@ msgstr ""
msgid "in the libvirt XML metadata, <name> is missing or empty"
msgstr ""
-#: ../mllib/common_utils.ml:283
+#: ../mllib/common_utils.ml:295
msgid "internal error: Not_found exception was thrown"
msgstr ""
-#: ../mllib/common_utils.ml:280
+#: ../mllib/common_utils.ml:292
msgid "internal error: assertion failed at %s, line %d, char %d"
msgstr ""
-#: ../mllib/common_utils.ml:278
+#: ../mllib/common_utils.ml:290
msgid "internal error: invalid argument: %s"
msgstr ""
@@ -2627,11 +2631,11 @@ msgstr ""
msgid "kernel %s is not under grub tree %s"
msgstr ""
-#: ../mllib/common_utils.ml:274
+#: ../mllib/common_utils.ml:286
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:458
+#: ../v2v/v2v.ml:467
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 "
@@ -2651,7 +2655,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:443
+#: ../v2v/v2v.ml:447
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "no operating systems were found in the guest image"
msgstr ""
-#: ../v2v/input_ova.ml:70
+#: ../v2v/input_ova.ml:69
msgid "no output from sha1sum command, see previous errors"
msgstr ""
@@ -2710,7 +2714,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:532
+#: ../v2v/v2v.ml:541
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2815,7 +2819,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:451
+#: ../v2v/v2v.ml:458
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2909,7 +2913,7 @@ msgid ""
"conf"
msgstr ""
-#: ../v2v/v2v.ml:470
+#: ../v2v/v2v.ml:479
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 "
--
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