[Pkg-libvirt-commits] [libguestfs] 08/12: Version 1.27.45.
Hilko Bengen
bengen at moszumanska.debian.org
Fri Oct 3 14:45:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.27.45-1
in repository libguestfs.
commit 48604913db4095ab8f6ecc80d9f92b5a04a5285c
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sun Sep 14 14:02:12 2014 +0100
Version 1.27.45.
---
BUGS | 25 +++--
configure.ac | 2 +-
po-docs/libguestfs-docs.pot | 4 +-
po/en_GB.po | 258 ++++++++++++++++++++++---------------------
po/es.po | 258 ++++++++++++++++++++++---------------------
po/gu.po | 258 ++++++++++++++++++++++---------------------
po/hi.po | 258 ++++++++++++++++++++++---------------------
po/kn.po | 258 ++++++++++++++++++++++---------------------
po/libguestfs.pot | 260 +++++++++++++++++++++++---------------------
po/ml.po | 258 ++++++++++++++++++++++---------------------
po/mr.po | 258 ++++++++++++++++++++++---------------------
po/nl.po | 258 ++++++++++++++++++++++---------------------
po/or.po | 258 ++++++++++++++++++++++---------------------
po/pa.po | 258 ++++++++++++++++++++++---------------------
po/pl.po | 258 ++++++++++++++++++++++---------------------
po/ta.po | 258 ++++++++++++++++++++++---------------------
po/te.po | 258 ++++++++++++++++++++++---------------------
po/uk.po | 258 ++++++++++++++++++++++---------------------
18 files changed, 2043 insertions(+), 1860 deletions(-)
diff --git a/BUGS b/BUGS
index 468f8e8..5332535 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-09-12
+Last updated: 2014-09-14
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -401,11 +401,8 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1140894 NEW 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
-1141113 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1141113
- virt-v2v fails to convert esx guests
-
-1141145 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1141145
- virt-v2v fails to convert xen pv guests.
+1141451 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1141451
+ Failures in tests: /dev/sda1: No such file or directory
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -431,7 +428,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1138619 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1138619
libguestfs-1.27.36-2.fc22: FTBFS with Perl 5.20
-(137 bugs)
+(136 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -449,12 +446,12 @@ 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
-1141157 POST https://bugzilla.redhat.com/show_bug.cgi?id=1141157
- virt-sysprep option '--user-accounts' don't work well
-
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
+1141145 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1141145
+ virt-v2v fails to convert xen pv guests.
+
805417 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=805417
RFE: support inspection of installation ISOs of WinVista, Win7, Win2008 & Win2008r2
@@ -476,7 +473,13 @@ You can help by testing the fixes.
1140547 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140547
virt-builder option '--format' don't work well
-(13 bugs)
+1141113 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1141113
+ virt-v2v fails to convert esx guests
+
+1141157 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1141157
+ virt-sysprep option '--user-accounts' don't work well
+
+(15 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index 0a752c1..1093db2 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], [44])
+m4_define([libguestfs_release], [45])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index a7f2f7f..a3a542b 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.44\n"
+"Project-Id-Version: libguestfs 1.27.45\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-09-12 22:42+0200\n"
+"POT-Creation-Date: 2014-09-14 13:57+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"
diff --git a/po/en_GB.po b/po/en_GB.po
index 192f49e..d0a2b5f 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: failed to create handle\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: unknown long option: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3252,7 +3264,7 @@ msgstr ""
" -x Trace libguestfs API calls\n"
"For more information, see the manpage %s(1).\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: you cannot use -h and --csv options together.\n"
@@ -3488,12 +3500,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3533,12 +3545,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6092,23 +6104,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr ""
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr ""
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr ""
@@ -6651,12 +6663,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6709,7 +6721,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7239,27 +7251,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 2729a8f..7333aba 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -103,7 +103,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -127,7 +127,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -367,7 +367,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -417,7 +417,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -544,11 +544,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -569,6 +569,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -579,15 +583,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -595,6 +599,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -603,11 +611,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -709,9 +717,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -739,7 +747,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -780,7 +788,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -794,7 +802,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -806,11 +814,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -830,7 +838,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -858,7 +866,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -898,7 +906,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -918,7 +926,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -942,11 +950,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -974,9 +982,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -996,11 +1004,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1012,37 +1020,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1054,6 +1062,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1066,7 +1078,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1138,7 +1150,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1230,7 +1242,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1271,13 +1283,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1298,7 +1310,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,10 +1431,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1442,11 +1454,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1717,7 +1729,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1725,7 +1737,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1733,29 +1745,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2201,7 +2213,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2282,9 +2294,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2300,7 +2312,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2314,7 +2326,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2396,7 +2408,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2404,9 +2416,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2416,8 +2428,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2494,7 +2506,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2510,7 +2522,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2530,7 +2542,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2571,7 +2583,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2579,7 +2591,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2589,7 +2601,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2623,7 +2635,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2631,7 +2643,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2682,7 +2694,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2694,7 +2706,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2820,9 +2832,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2992,7 +3004,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3000,13 +3012,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3038,7 +3050,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3074,24 +3086,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: falló al crear manipulador\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: opción extensa desconocida: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3258,7 +3270,7 @@ msgstr ""
" -x Rastrea llamadas API de libguestfs\n"
"Para obtener mayor información, consulte la página man %s(1).\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: no puede utilizar al mismo tiempo las opciones -h y -cvs.\n"
@@ -3496,12 +3508,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3541,12 +3553,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr "%s: la opción -b ha sido indicada en múltiples oportunidades\n"
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr "%s: la opción -e ha sido indicada en múltiples oportunidades\n"
@@ -6144,12 +6156,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID no era un número: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
@@ -6157,12 +6169,12 @@ msgstr ""
"%s: remote: $GUESTFISH_PID debe estar definido con el PID del proceso "
"remoto\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: sólo puede ofrecerse un parámetro -f\n"
@@ -6755,12 +6767,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6813,7 +6825,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7360,27 +7372,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr "%s: no pudo parsearse el parametro --smp '%s'\n"
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr "%s: el parámetro --smp '%s' debería ser >= 1\n"
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s: no se pudo analizar el tamaño '%s' de la memoria\n"
diff --git a/po/gu.po b/po/gu.po
index 8b77fc9..46f8f00 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -259,7 +259,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -366,7 +366,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -543,11 +543,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -568,6 +568,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -578,15 +582,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -594,6 +598,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -602,11 +610,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -708,9 +716,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -738,7 +746,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -779,7 +787,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -793,7 +801,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -805,11 +813,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -829,7 +837,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -857,7 +865,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -897,7 +905,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -917,7 +925,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -941,11 +949,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -973,9 +981,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -995,11 +1003,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1011,37 +1019,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1053,6 +1061,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1065,7 +1077,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1229,7 +1241,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1270,13 +1282,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1297,7 +1309,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,10 +1430,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1441,11 +1453,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1716,7 +1728,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1724,7 +1736,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1732,29 +1744,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2200,7 +2212,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2281,9 +2293,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2299,7 +2311,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2313,7 +2325,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2395,7 +2407,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2403,9 +2415,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2415,8 +2427,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2493,7 +2505,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2509,7 +2521,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2529,7 +2541,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2570,7 +2582,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2578,7 +2590,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2588,7 +2600,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2622,7 +2634,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2630,7 +2642,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2681,7 +2693,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2693,7 +2705,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2819,9 +2831,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2991,7 +3003,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2999,13 +3011,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3037,7 +3049,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3073,24 +3085,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: હેન્ડલ ને બનાવવાનું નિષ્ફળ\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: અજ્ઞાત લાંબો વિકલ્પ: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3219,7 +3231,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: તમે -h અને --csv વિકલ્પોને ભેગાં વાપરી શકતા નથી.\n"
@@ -3455,12 +3467,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3500,12 +3512,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6059,23 +6071,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID એ નંબર ન હતો: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: દૂરસ્થ: $GUESTFISH_PID એ દૂરસ્થ પ્રક્રિયાનાં PID ને સુયોજિત કરવુ જ પડશે\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: ફક્ત એક -f પરિમાણને આપી શકાય છે\n"
@@ -6628,12 +6640,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6686,7 +6698,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7216,27 +7228,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 9c839ad..57fff87 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -259,7 +259,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -366,7 +366,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -543,11 +543,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -568,6 +568,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -578,15 +582,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -594,6 +598,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -602,11 +610,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -708,9 +716,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -738,7 +746,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -779,7 +787,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -793,7 +801,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -805,11 +813,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -829,7 +837,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -857,7 +865,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -897,7 +905,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -917,7 +925,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -941,11 +949,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -973,9 +981,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -995,11 +1003,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1011,37 +1019,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1053,6 +1061,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1065,7 +1077,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1229,7 +1241,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1270,13 +1282,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1297,7 +1309,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,10 +1430,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1441,11 +1453,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1716,7 +1728,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1724,7 +1736,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1732,29 +1744,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2200,7 +2212,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2281,9 +2293,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2299,7 +2311,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2313,7 +2325,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2395,7 +2407,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2403,9 +2415,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2415,8 +2427,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2493,7 +2505,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2509,7 +2521,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2529,7 +2541,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2570,7 +2582,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2578,7 +2590,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2588,7 +2600,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2622,7 +2634,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2630,7 +2642,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2681,7 +2693,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2693,7 +2705,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2819,9 +2831,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2991,7 +3003,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2999,13 +3011,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3037,7 +3049,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3073,24 +3085,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: नियंत्रण बनाने में विफल\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: unknown long option: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3219,7 +3231,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3455,12 +3467,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3500,12 +3512,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6059,24 +6071,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID was not a number: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: only one -f parameter can be given\n"
@@ -6626,12 +6638,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6684,7 +6696,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7214,27 +7226,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 489806b..f0a43e8 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿರ್ಮಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ಗೊತ್ತಿರದ ಉದ್ದನೆಯ ಆಯ್ಕೆ: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3218,7 +3230,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3454,12 +3466,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3499,12 +3511,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6060,23 +6072,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID ಒಂದು ಸಂಖ್ಯೆಯಾಗಿಲ್ಲ: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: remote: $GUESTFISH_PID ಅನ್ನು ದೂರಸ್ಥ ಪ್ರಕ್ರಿಯೆಯ PID ಗೆ ಹೊಂದಿಸಬೇಕು\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: ಕೇವಲ ಒಂದು -f ನಿಯತಾಂಕವನ್ನು ಒದಗಿಸಬಹುದು\n"
@@ -6630,12 +6642,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6688,7 +6700,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7218,27 +7230,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 1f0a187..e7c60a6 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.27.44\n"
+"Project-Id-Version: libguestfs 1.27.45\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -100,7 +100,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -257,7 +257,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -364,7 +364,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -541,11 +541,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -566,6 +566,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -576,15 +580,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -592,6 +596,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -600,11 +608,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -706,9 +714,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -736,7 +744,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -777,7 +785,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -791,7 +799,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -803,11 +811,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -827,7 +835,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -855,7 +863,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -895,7 +903,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -915,7 +923,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -939,11 +947,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -971,9 +979,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -993,11 +1001,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1009,37 +1017,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1051,6 +1059,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1063,7 +1075,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1227,7 +1239,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1268,13 +1280,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1295,7 +1307,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1416,10 +1428,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1439,11 +1451,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1714,7 +1726,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1722,7 +1734,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1730,29 +1742,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2198,7 +2210,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2279,9 +2291,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2297,7 +2309,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2311,7 +2323,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2393,7 +2405,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2401,9 +2413,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2413,8 +2425,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2491,7 +2503,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2507,7 +2519,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2527,7 +2539,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2568,7 +2580,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2576,7 +2588,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2586,7 +2598,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2620,7 +2632,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2628,7 +2640,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2679,7 +2691,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2691,7 +2703,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2817,9 +2829,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2989,7 +3001,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2997,13 +3009,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3035,7 +3047,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3071,24 +3083,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr ""
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr ""
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3217,7 +3229,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3453,12 +3465,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3498,12 +3510,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6057,23 +6069,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr ""
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr ""
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr ""
@@ -6616,12 +6628,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6674,7 +6686,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7204,27 +7216,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 036692e..ef38e8e 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ഹാന്ഡില് ഉണ്ടാക്കുന്നതില് പരാജയപ്പെട്ടു\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: അപരിചിതമായ ലോങ് ഉപാധി: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3218,7 +3230,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3454,12 +3466,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3499,12 +3511,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6061,23 +6073,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID ഒരു നംബറല്ല: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: remote: റിമോട്ട് പ്രക്രിയയുടെ PID-ലേക്ക് $GUESTFISH_PID സജ്ജമാക്കേണം\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: ഒരു -f പരാമീറ്റര് മാത്രമേ പാടുള്ളൂ\n"
@@ -6628,12 +6640,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6686,7 +6698,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7216,27 +7228,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 5a88673..92b7696 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -259,7 +259,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -366,7 +366,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -543,11 +543,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -568,6 +568,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -578,15 +582,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -594,6 +598,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -602,11 +610,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -708,9 +716,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -738,7 +746,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -779,7 +787,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -793,7 +801,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -805,11 +813,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -829,7 +837,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -857,7 +865,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -897,7 +905,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -917,7 +925,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -941,11 +949,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -973,9 +981,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -995,11 +1003,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1011,37 +1019,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1053,6 +1061,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1065,7 +1077,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1229,7 +1241,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1270,13 +1282,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1297,7 +1309,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,10 +1430,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1441,11 +1453,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1716,7 +1728,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1724,7 +1736,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1732,29 +1744,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2200,7 +2212,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2281,9 +2293,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2299,7 +2311,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2313,7 +2325,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2395,7 +2407,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2403,9 +2415,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2415,8 +2427,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2493,7 +2505,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2509,7 +2521,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2529,7 +2541,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2570,7 +2582,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2578,7 +2590,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2588,7 +2600,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2622,7 +2634,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2630,7 +2642,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2681,7 +2693,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2693,7 +2705,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2819,9 +2831,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2991,7 +3003,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2999,13 +3011,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3037,7 +3049,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3073,24 +3085,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: हँडल निर्माण करण्यास अशक्य\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: अपरिचीत लाँग पर्याय: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3253,7 +3265,7 @@ msgstr ""
" -x libguestfs API कॉल्स् ट्रेस करा\n"
"अधिक माहितीकरीता, manpage %s(1) पहा.\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: -h व --csv पर्यायचा एकत्रपणे वापर शक्य नाही.\n"
@@ -3489,12 +3501,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3534,12 +3546,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6098,23 +6110,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID क्रमांक प्रमाणे आढळले नाही: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: रिमोट: $GUESTFISH_PID यांस रिमोट कार्याच्या PID करीता सेट केले पाहिजे\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: फक्त एकच -f घटक दिले जाऊ शकते\n"
@@ -6685,12 +6697,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6743,7 +6755,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7283,27 +7295,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s: मेमरी आकार '%s' वाचणे अशक्य\n"
diff --git a/po/nl.po b/po/nl.po
index 4b91c3c..e23156b 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -103,7 +103,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -127,7 +127,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -367,7 +367,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -417,7 +417,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -544,11 +544,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -569,6 +569,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -579,15 +583,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -595,6 +599,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -603,11 +611,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -709,9 +717,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -739,7 +747,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -780,7 +788,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -794,7 +802,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -806,11 +814,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -830,7 +838,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -858,7 +866,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -898,7 +906,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -918,7 +926,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -942,11 +950,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -974,9 +982,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -996,11 +1004,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1012,37 +1020,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1054,6 +1062,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1066,7 +1078,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1138,7 +1150,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1230,7 +1242,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1271,13 +1283,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1298,7 +1310,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,10 +1431,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1442,11 +1454,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1717,7 +1729,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1725,7 +1737,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1733,29 +1745,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2201,7 +2213,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2282,9 +2294,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2300,7 +2312,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2314,7 +2326,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2396,7 +2408,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2404,9 +2416,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2416,8 +2428,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2494,7 +2506,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2510,7 +2522,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2530,7 +2542,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2571,7 +2583,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2579,7 +2591,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2589,7 +2601,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2623,7 +2635,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2631,7 +2643,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2682,7 +2694,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2694,7 +2706,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2820,9 +2832,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2992,7 +3004,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3000,13 +3012,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3038,7 +3050,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3074,24 +3086,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: hendel aanmaken mislukte\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: onbekende lange optie: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3254,7 +3266,7 @@ msgstr ""
" -x Traceer libguestfs API aanroepen\n"
"Voor meer informatie, zie de man pagina %s(1).\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: je kunt de -h en --csv opties ziet tezamen gebruiken.\n"
@@ -3494,12 +3506,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3539,12 +3551,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr "%s: -b optie meerdere keren opgegeven\n"
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr "%s: -e optie meerdere keren opgegeven\n"
@@ -6121,12 +6133,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID was geen getal: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
@@ -6134,12 +6146,12 @@ msgstr ""
"%s: remote: $GUESTFISH_PID moet ingesteld worden op de PID van het proces op "
"afstand\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: er kan slechts een -f parameter opgegeven worden\n"
@@ -6769,12 +6781,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr "%s: er was geen bestandssysteem gespecificeerd\n"
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr "%s: --lvm optie kan niet meerdere malen worden gegeven\n"
@@ -6831,7 +6843,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7393,27 +7405,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr "%s: kon --smp parameter '%s' niet ontleden\n"
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr "%s: --smp parameter '%s' moet >= 1 zijn\n"
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr "%s: kon --scratch parameter '%s' noet ontleden\n"
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr "%s: --scratch parameter '%s' moet >= 1 zijn\n"
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s:kon geheugen grootte niet ontleden '%s'\n"
diff --git a/po/or.po b/po/or.po
index 28b379e..c69e807 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ନିୟନ୍ତ୍ରଣ ପ୍ରସ୍ତୁତ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ଅଜଣା ଲମ୍ବା ବିକଳ୍ପ: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3218,7 +3230,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3454,12 +3466,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3499,12 +3511,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6059,23 +6071,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID ଗୋଟିଏ ସଂଖ୍ୟା ନୁହଁ: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: ସୁଦୂର: $GUESTFISH_PID ନିଶ୍ଚିତ ଭାବରେ PID ରେ ସୁଦୂର ପଦ୍ଧତିରେ ସେଟ ହୋଇଛି\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: କେବଳ ଗୋଟିଏ -f ପ୍ରାଚଳ ଦିଆହୋଇଛି\n"
@@ -6626,12 +6638,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6684,7 +6696,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7214,27 +7226,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index a4fb10f..f1eccb5 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -70,7 +70,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -259,7 +259,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -366,7 +366,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -416,7 +416,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -543,11 +543,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -568,6 +568,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -578,15 +582,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -594,6 +598,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -602,11 +610,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -708,9 +716,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -738,7 +746,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -779,7 +787,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -793,7 +801,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -805,11 +813,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -829,7 +837,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -857,7 +865,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -897,7 +905,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -917,7 +925,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -941,11 +949,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -973,9 +981,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -995,11 +1003,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1011,37 +1019,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1053,6 +1061,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1065,7 +1077,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1229,7 +1241,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1270,13 +1282,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1297,7 +1309,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1418,10 +1430,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1441,11 +1453,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1716,7 +1728,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1724,7 +1736,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1732,29 +1744,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2200,7 +2212,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2281,9 +2293,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2299,7 +2311,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2313,7 +2325,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2395,7 +2407,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2403,9 +2415,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2415,8 +2427,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2493,7 +2505,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2509,7 +2521,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2529,7 +2541,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2570,7 +2582,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2578,7 +2590,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2588,7 +2600,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2622,7 +2634,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2630,7 +2642,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2681,7 +2693,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2693,7 +2705,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2819,9 +2831,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2991,7 +3003,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2999,13 +3011,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3037,7 +3049,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3073,24 +3085,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ਹੈਂਡਲ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: ਅਣਜਾਣ long ਚੋਣ: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3253,7 +3265,7 @@ msgstr ""
" -x Trace libguestfs API calls\n"
"For more information, see the manpage %s(1)।\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: ਤੁਸੀਂ -h ਅਤੇ --csv ਚੋਣਾਂ ਇਕੱਠੀਆਂ ਨਹੀਂ ਵਰਤ ਸਕਦੇ।\n"
@@ -3489,12 +3501,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3534,12 +3546,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6095,23 +6107,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID ਇੱਕ ਨੰਬਰ ਨਹੀਂ ਸੀ: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: remote: $GUESTFISH_PID ਦਾ ਮੁੱਲ ਰਿਮੋਟ ਕਾਰਜ ਦਾ PID ਹੋਣਾ ਜਰੂਰੀ ਹੈ\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: only one -f parameter can be given\n"
@@ -6680,12 +6692,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6738,7 +6750,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7280,27 +7292,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s: ਮੈਮੋਰੀ ਅਕਾਰ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ '%s'\n"
diff --git a/po/pl.po b/po/pl.po
index 8e0cae3..ac438a7 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -105,7 +105,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -129,7 +129,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -262,7 +262,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -369,7 +369,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -419,7 +419,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -546,11 +546,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -571,6 +571,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -581,15 +585,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -597,6 +601,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -605,11 +613,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -711,9 +719,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -741,7 +749,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -782,7 +790,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -796,7 +804,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -808,11 +816,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -832,7 +840,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -860,7 +868,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -900,7 +908,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -920,7 +928,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -944,11 +952,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -976,9 +984,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -998,11 +1006,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1014,37 +1022,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1056,6 +1064,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1068,7 +1080,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1140,7 +1152,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1232,7 +1244,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1273,13 +1285,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1300,7 +1312,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1421,10 +1433,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1444,11 +1456,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1719,7 +1731,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1727,7 +1739,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1735,29 +1747,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2203,7 +2215,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2284,9 +2296,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2302,7 +2314,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2316,7 +2328,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2398,7 +2410,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2406,9 +2418,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2418,8 +2430,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2496,7 +2508,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2512,7 +2524,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2532,7 +2544,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2573,7 +2585,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2581,7 +2593,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2591,7 +2603,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2625,7 +2637,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2633,7 +2645,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2684,7 +2696,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2696,7 +2708,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2822,9 +2834,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2994,7 +3006,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3002,13 +3014,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3040,7 +3052,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3076,24 +3088,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: utworzenie programu obsługi się nie powiodło\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: nieznana długa opcja: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3258,7 +3270,7 @@ msgstr ""
" -x Śledzi wywołania API biblioteki libguestfs\n"
"Aby dowiedzieć się więcej, należy zobaczyć stronę podręcznika %s(1).\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: nie można używać opcji -h oraz --csv jednocześnie.\n"
@@ -3501,12 +3513,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3546,12 +3558,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr "%s: opcję -b podano wiele razy\n"
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr "%s: opcję -e podano wiele razy\n"
@@ -6137,24 +6149,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID nie był liczbą: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr ""
"%s: zdalnie: $GUESTFISH_PID musi być ustawiony na PID zdalnego procesu\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: można podać tylko jeden parametr -f\n"
@@ -6784,12 +6796,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr "%s: nie podano systemu plików\n"
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr "%s: opcji --lvm nie można podać wiele razy\n"
@@ -6847,7 +6859,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7411,27 +7423,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr "%s: nie można przetworzyć parametru \"%s\" opcji --smp\n"
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr "%s: parametr \"%s\" opcji --smp powinien wynosić >= 1\n"
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s: nie można przetworzyć rozmiaru pamięci \"%s\"\n"
diff --git a/po/ta.po b/po/ta.po
index acde434..ce6a2c1 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: ஹாண்டிலை உருவாக்க முடியவில்லை\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: தெரியாத நீண்ட விருப்பம்: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3218,7 +3230,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3454,12 +3466,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3499,12 +3511,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6059,23 +6071,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID ஆனது எண் இல்லை: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: remote: $GUESTFISH_PID க்கு தொலை செயற்பாட்டைPID க்கு அமை\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: ஒரே ஒரு -f அளவுரு கொடுக்கப்படலாம்\n"
@@ -6627,12 +6639,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6685,7 +6697,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7215,27 +7227,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 8cccac5..dff1bf2 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -69,7 +69,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -365,7 +365,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -415,7 +415,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -542,11 +542,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -567,6 +567,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -577,15 +581,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -593,6 +597,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -601,11 +609,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -707,9 +715,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -737,7 +745,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -778,7 +786,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -792,7 +800,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -804,11 +812,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -828,7 +836,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -856,7 +864,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -896,7 +904,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -916,7 +924,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -940,11 +948,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -972,9 +980,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -994,11 +1002,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1010,37 +1018,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1052,6 +1060,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1064,7 +1076,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1228,7 +1240,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1269,13 +1281,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1296,7 +1308,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1417,10 +1429,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1440,11 +1452,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1715,7 +1727,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1723,7 +1735,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1731,29 +1743,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2199,7 +2211,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2280,9 +2292,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2298,7 +2310,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2312,7 +2324,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2394,7 +2406,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2402,9 +2414,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2414,8 +2426,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2492,7 +2504,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2508,7 +2520,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2528,7 +2540,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2569,7 +2581,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2577,7 +2589,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2587,7 +2599,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2621,7 +2633,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2629,7 +2641,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2680,7 +2692,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2692,7 +2704,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2818,9 +2830,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2990,7 +3002,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -2998,13 +3010,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3036,7 +3048,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3072,24 +3084,24 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: సంభాలికను సృష్టించుటకు విఫలమైంది\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: తెలియని long ఐచ్చికము: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr ""
@@ -3218,7 +3230,7 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr ""
@@ -3454,12 +3466,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr ""
@@ -3499,12 +3511,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr ""
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr ""
@@ -6058,23 +6070,23 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID సంఖ్య కాదు: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr "%s: remote: $GUESTFISH_PID అనునది రిమోట్ కార్యక్రమము యొక్క PIDకు అమర్చాలి\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: ఒక -f పారామితి మాత్రమే యివ్వగలము\n"
@@ -6624,12 +6636,12 @@ msgid ""
"\n"
msgstr ""
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr ""
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr ""
@@ -6682,7 +6694,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7212,27 +7224,27 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr ""
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr ""
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 4540afb..c9ec0d9 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-09-12 22:42+0100\n"
+"POT-Creation-Date: 2014-09-14 13:57+0100\n"
"PO-Revision-Date: 2014-07-22 18:03+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -71,7 +71,7 @@ msgstr ""
msgid "%s"
msgstr ""
-#: ../sysprep/main.ml:254 ../customize/customize_main.ml:227
+#: ../sysprep/main.ml:264 ../customize/customize_main.ml:242
msgid "%s (ignored)\n"
msgstr ""
@@ -103,7 +103,7 @@ msgstr ""
msgid "%s: %s"
msgstr ""
-#: ../v2v/v2v.ml:216
+#: ../v2v/v2v.ml:237
msgid "%s: %s (ignored)"
msgstr ""
@@ -127,7 +127,7 @@ msgstr ""
msgid "%s: '%s' has non-local gpgkey URI\n"
msgstr ""
-#: ../customize/customize_main.ml:68
+#: ../customize/customize_main.ml:77
msgid "%s: --domain option can only be given once\n"
msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
msgid "%s: curl is not installed (or does not work)\n"
msgstr ""
-#: ../customize/customize_main.ml:119
+#: ../customize/customize_main.ml:128
msgid ""
"%s: customize a virtual machine\n"
"\n"
@@ -367,7 +367,7 @@ msgid ""
"This is a failure of the source repository. Use -v for more information.\n"
msgstr ""
-#: ../customize/customize_main.ml:213
+#: ../customize/customize_main.ml:228
msgid "%s: no operating systems were found in the guest image\n"
msgstr ""
@@ -417,7 +417,7 @@ msgstr ""
msgid "%s: physical volume not returned by pvs_full"
msgstr ""
-#: ../sysprep/main.ml:153
+#: ../sysprep/main.ml:160
msgid ""
"%s: reset or unconfigure a virtual machine so clones can be made\n"
"\n"
@@ -544,11 +544,11 @@ msgstr ""
msgid "%s: warning: %s"
msgstr ""
-#: ../customize/customize_main.ml:152
+#: ../customize/customize_main.ml:167
msgid "%s: you cannot give -a and -d options together\n"
msgstr ""
-#: ../customize/customize_main.ml:139
+#: ../customize/customize_main.ml:154
msgid "%s: you must give either -a or -d options\n"
msgstr ""
@@ -569,6 +569,10 @@ msgstr ""
msgid "'CMD+ARGS'"
msgstr ""
+#: ../customize/customize_main.ml:145
+msgid "--attach-format parameter must appear before --attach parameter"
+msgstr ""
+
#: ../sparsify/cmdline.ml:50
msgid "--check-tmpdir: unknown argument `%s'\n"
msgstr ""
@@ -579,15 +583,15 @@ msgid ""
"convert qcow2."
msgstr ""
-#: ../sysprep/main.ml:62
+#: ../sysprep/main.ml:69
msgid "--domain option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:72
+#: ../sysprep/main.ml:79
msgid "--enable option can only be given once"
msgstr ""
-#: ../sysprep/main.ml:80
+#: ../sysprep/main.ml:87
msgid "--enable: '%s' is not a known operation"
msgstr ""
@@ -595,6 +599,10 @@ msgstr ""
msgid "--expand option given twice"
msgstr ""
+#: ../sysprep/main.ml:174 ../customize/customize_main.ml:142
+msgid "--format parameter must appear before -a parameter"
+msgstr ""
+
#: ../v2v/cmdline.ml:277
msgid "--no-copy and '-o glance' cannot be used at the same time"
msgstr ""
@@ -603,11 +611,11 @@ msgstr ""
msgid "--no-copy and '-o libvirt' cannot be used at the same time"
msgstr ""
-#: ../sysprep/main.ml:110
+#: ../sysprep/main.ml:117
msgid "--operations: '%s' is not a known operation"
msgstr ""
-#: ../sysprep/main.ml:99
+#: ../sysprep/main.ml:106
msgid "--operations: empty operation name"
msgstr ""
@@ -709,9 +717,9 @@ msgstr ""
msgid "<disk type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "Add disk image file"
msgstr ""
@@ -739,7 +747,7 @@ msgstr ""
msgid "Architecture:"
msgstr ""
-#: ../customize/customize_main.ml:77 ../builder/cmdline.ml:108
+#: ../customize/customize_main.ml:86 ../builder/cmdline.ml:108
msgid "Attach data disk/ISO during install"
msgstr ""
@@ -780,7 +788,7 @@ msgstr ""
msgid "Check there is enough space in $TMPDIR"
msgstr ""
-#: ../v2v/v2v.ml:183
+#: ../v2v/v2v.ml:198
msgid "Checking for sufficient free disk space in the guest"
msgstr ""
@@ -794,7 +802,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:220
+#: ../v2v/v2v.ml:241
msgid "Closing the overlay"
msgstr ""
@@ -806,11 +814,11 @@ msgstr ""
msgid "Converting %s to %s"
msgstr ""
-#: ../v2v/v2v.ml:192
+#: ../v2v/v2v.ml:213
msgid "Converting %s to run on KVM"
msgstr ""
-#: ../v2v/v2v.ml:190
+#: ../v2v/v2v.ml:211
msgid "Converting the guest to run on KVM"
msgstr ""
@@ -830,7 +838,7 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/v2v.ml:239
+#: ../v2v/v2v.ml:260
msgid "Copying disk %d/%d to %s (%s)"
msgstr ""
@@ -858,7 +866,7 @@ msgstr ""
msgid "Creating an overlay to protect the source from being modified"
msgstr ""
-#: ../v2v/v2v.ml:284
+#: ../v2v/v2v.ml:305
msgid "Creating output metadata"
msgstr ""
@@ -898,7 +906,7 @@ msgstr ""
msgid "Debug GC and memory allocations"
msgstr ""
-#: ../sysprep/main.ml:123 ../customize/customize_main.ml:82
+#: ../sysprep/main.ml:130 ../customize/customize_main.ml:91
msgid "Debug GC and memory allocations (internal)"
msgstr ""
@@ -918,7 +926,7 @@ msgstr ""
msgid "Deleting: %s"
msgstr ""
-#: ../customize/customize_main.ml:93 ../builder/cmdline.ml:144
+#: ../customize/customize_main.ml:102 ../builder/cmdline.ml:144
msgid "Disable appliance network"
msgstr ""
@@ -942,11 +950,11 @@ msgstr ""
#. ../sparsify/cmdline.ml:86
#. ../resize/resize.ml:213
-#. ../customize/customize_main.ml:100
-#. ../customize/customize_main.ml:99
+#. ../customize/customize_main.ml:109
+#. ../customize/customize_main.ml:108
#. ../builder/cmdline.ml:158
#. ../builder/cmdline.ml:157
-#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:143 ../sysprep/main.ml:142
+#: ../v2v/cmdline.ml:149 ../sysprep/main.ml:150 ../sysprep/main.ml:149
msgid "Display version and exit"
msgstr ""
@@ -974,9 +982,9 @@ msgstr ""
msgid "Don't perform changes"
msgstr ""
-#. ../customize/customize_main.ml:95
-#. ../customize/customize_main.ml:94
-#: ../sysprep/main.ml:139 ../sysprep/main.ml:138
+#. ../customize/customize_main.ml:104
+#. ../customize/customize_main.ml:103
+#: ../sysprep/main.ml:146 ../sysprep/main.ml:145
msgid "Don't print log messages"
msgstr ""
@@ -996,11 +1004,11 @@ msgstr ""
msgid "Downloading: %s"
msgstr ""
-#: ../sysprep/main.ml:129
+#: ../sysprep/main.ml:136
msgid "Dump POD (internal)"
msgstr ""
-#: ../sysprep/main.ml:130
+#: ../sysprep/main.ml:137
msgid "Dump POD for options (internal)"
msgstr ""
@@ -1012,37 +1020,37 @@ msgstr ""
msgid "Editing: %s"
msgstr ""
-#: ../customize/customize_main.ml:92 ../builder/cmdline.ml:143
+#: ../customize/customize_main.ml:101 ../builder/cmdline.ml:143
msgid "Enable appliance network (default)"
msgstr ""
#. ../sparsify/cmdline.ml:84
#. ../resize/resize.ml:211
#. ../resize/resize.ml:185
-#. ../customize/customize_main.ml:98
-#. ../customize/customize_main.ml:97
+#. ../customize/customize_main.ml:107
+#. ../customize/customize_main.ml:106
#. ../builder/cmdline.ml:156
#. ../builder/cmdline.ml:155
-#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:141 ../sysprep/main.ml:140
+#: ../v2v/cmdline.ml:147 ../sysprep/main.ml:148 ../sysprep/main.ml:147
msgid "Enable debugging messages"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "Enable specific operations"
msgstr ""
#. ../resize/resize.ml:215
-#. ../customize/customize_main.ml:101
+#. ../customize/customize_main.ml:110
#. ../builder/cmdline.ml:159
-#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:144 ../sparsify/cmdline.ml:88
+#: ../v2v/cmdline.ml:152 ../sysprep/main.ml:151 ../sparsify/cmdline.ml:88
msgid "Enable tracing of libguestfs calls"
msgstr ""
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:136
+#: ../sysprep/main.ml:144 ../sysprep/main.ml:143
msgid "Enable/disable specific operations"
msgstr ""
-#: ../v2v/v2v.ml:320
+#: ../v2v/v2v.ml:341
msgid "Enter number between 1 and %d: "
msgstr ""
@@ -1054,6 +1062,10 @@ msgstr ""
msgid "Error parsing disk fileRef"
msgstr ""
+#: ../v2v/v2v.ml:202
+msgid "Estimating space required on target for each disk"
+msgstr ""
+
#: ../sparsify/copying.ml:184
msgid ""
"Examine source disk ...\n"
@@ -1066,7 +1078,7 @@ msgid ""
"%!"
msgstr ""
-#: ../sysprep/main.ml:224 ../customize/customize_main.ml:185
+#: ../sysprep/main.ml:234 ../customize/customize_main.ml:200
msgid "Examining the guest ..."
msgstr ""
@@ -1138,7 +1150,7 @@ msgstr ""
msgid "Fingerprint: %s\n"
msgstr ""
-#: ../v2v/v2v.ml:287 ../customize/customize_main.ml:237
+#: ../v2v/v2v.ml:308 ../customize/customize_main.ml:252
#: ../builder/builder.ml:711
msgid "Finishing off"
msgstr ""
@@ -1230,7 +1242,7 @@ msgstr ""
msgid "Input format (for -i disk)"
msgstr ""
-#: ../v2v/v2v.ml:179
+#: ../v2v/v2v.ml:183
msgid "Inspecting the overlay"
msgstr ""
@@ -1271,13 +1283,13 @@ msgid "List available templates"
msgstr ""
#. ../resize/resize.ml:194
-#. ../customize/customize_main.ml:89
+#. ../customize/customize_main.ml:98
#. ../builder/cmdline.ml:139
-#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:134 ../sparsify/cmdline.ml:78
+#: ../v2v/cmdline.ml:127 ../sysprep/main.ml:141 ../sparsify/cmdline.ml:78
msgid "List long options"
msgstr ""
-#: ../sysprep/main.ml:133
+#: ../sysprep/main.ml:140
msgid "List supported operations"
msgstr ""
@@ -1298,7 +1310,7 @@ msgstr ""
msgid "Map network 'in' to 'out'"
msgstr ""
-#: ../v2v/v2v.ml:211
+#: ../v2v/v2v.ml:232
msgid "Mapping filesystem data to avoid copying unused and blank areas"
msgstr ""
@@ -1419,10 +1431,10 @@ msgstr ""
msgid "POD notes for %s must not end with newline"
msgstr ""
-#. ../customize/customize_main.ml:87
-#. ../customize/customize_main.ml:86
-#. ../customize/customize_main.ml:85
-#: ../sysprep/main.ml:128 ../sysprep/main.ml:127 ../sysprep/main.ml:126
+#. ../customize/customize_main.ml:96
+#. ../customize/customize_main.ml:95
+#. ../customize/customize_main.ml:94
+#: ../sysprep/main.ml:135 ../sysprep/main.ml:134 ../sysprep/main.ml:133
msgid "Perform a dry run"
msgstr ""
@@ -1442,11 +1454,11 @@ msgstr ""
msgid "Quiet output"
msgstr ""
-#: ../v2v/lib_ovf.ml:349 ../v2v/lib_ovf.ml:175
+#: ../v2v/lib_ovf.ml:352 ../v2v/lib_ovf.ml:175
msgid "RHEV does not support the output format '%s', only raw or qcow2"
msgstr ""
-#: ../customize/customize_main.ml:153 ../customize/customize_main.ml:140
+#: ../customize/customize_main.ml:168 ../customize/customize_main.ml:155
msgid "Read virt-customize(1) man page for further information.\n"
msgstr ""
@@ -1717,7 +1729,7 @@ msgstr ""
msgid "Set GPG binary/command"
msgstr ""
-#: ../customize/customize_main.ml:79 ../builder/cmdline.ml:110
+#: ../customize/customize_main.ml:88 ../builder/cmdline.ml:110
msgid "Set attach disk format"
msgstr ""
@@ -1725,7 +1737,7 @@ msgstr ""
msgid "Set curl binary/command"
msgstr ""
-#: ../sysprep/main.ml:132 ../customize/customize_main.ml:88
+#: ../sysprep/main.ml:139 ../customize/customize_main.ml:97
msgid "Set format (default: auto)"
msgstr ""
@@ -1733,29 +1745,29 @@ msgstr ""
msgid "Set input mode (default: libvirt)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "Set libvirt URI"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "Set libvirt guest name"
msgstr ""
#. ../builder/cmdline.ml:142
#. ../builder/cmdline.ml:141
-#: ../customize/customize_main.ml:91 ../customize/customize_main.ml:90
+#: ../customize/customize_main.ml:100 ../customize/customize_main.ml:99
msgid "Set memory size"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
msgstr ""
-#: ../customize/customize_main.ml:96 ../builder/cmdline.ml:152
+#: ../customize/customize_main.ml:105 ../builder/cmdline.ml:152
msgid "Set number of vCPUs"
msgstr ""
@@ -2201,7 +2213,7 @@ msgid ""
"\\Windows\\CurrentVersion\\Uninstall\\%s' does not contain an '%s' key"
msgstr ""
-#: ../v2v/v2v.ml:323
+#: ../v2v/v2v.ml:344
msgid "connection closed"
msgstr ""
@@ -2282,9 +2294,9 @@ msgstr ""
msgid "display <graphics type='%s'> was ignored"
msgstr ""
-#. ../customize/customize_main.ml:84
-#. ../customize/customize_main.ml:83
-#: ../sysprep/main.ml:125 ../sysprep/main.ml:124
+#. ../customize/customize_main.ml:93
+#. ../customize/customize_main.ml:92
+#: ../sysprep/main.ml:132 ../sysprep/main.ml:131
msgid "domain"
msgstr ""
@@ -2300,7 +2312,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/v2v.ml:307
+#: ../v2v/v2v.ml:328
msgid ""
"dual- or multi-boot operating system detected. Choose the root filesystem\n"
"that contains the main operating system from the list below:\n"
@@ -2314,7 +2326,7 @@ msgstr ""
msgid "empty --shrink option"
msgstr ""
-#: ../sysprep/main.ml:57 ../resize/resize.ml:313
+#: ../sysprep/main.ml:63 ../resize/resize.ml:313
msgid "error parsing URI '%s'. Look for error messages printed above."
msgstr ""
@@ -2396,7 +2408,7 @@ msgstr ""
msgid "external command failed: %s"
msgstr ""
-#: ../sysprep/main.ml:151 ../customize/customize_main.ml:117
+#: ../sysprep/main.ml:158 ../customize/customize_main.ml:126
msgid "extra parameter on the command line"
msgstr ""
@@ -2404,9 +2416,9 @@ msgstr ""
msgid "failure: %s"
msgstr ""
-#. ../customize/customize_main.ml:76
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:120 ../sysprep/main.ml:119
+#. ../customize/customize_main.ml:85
+#. ../customize/customize_main.ml:84
+#: ../sysprep/main.ml:127 ../sysprep/main.ml:126
msgid "file"
msgstr ""
@@ -2416,8 +2428,8 @@ msgstr ""
#. ../resize/resize.ml:204
#. ../resize/resize.ml:192
-#. ../customize/customize_main.ml:88
-#: ../sysprep/main.ml:132 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
+#. ../customize/customize_main.ml:97
+#: ../sysprep/main.ml:139 ../sparsify/cmdline.ml:74 ../sparsify/cmdline.ml:72
msgid "format"
msgstr ""
@@ -2494,7 +2506,7 @@ msgstr ""
msgid "internal error: invalid argument: %s"
msgstr ""
-#: ../v2v/v2v.ml:251
+#: ../v2v/v2v.ml:272
msgid "internal error: qemu corrupted the overlay file"
msgstr ""
@@ -2510,7 +2522,7 @@ msgstr ""
msgid "libguestfs error: %s"
msgstr ""
-#: ../v2v/v2v.ml:345
+#: ../v2v/v2v.ml:366
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 "
@@ -2530,7 +2542,7 @@ msgid ""
"you need to rerun virt-v2v as root."
msgstr ""
-#: ../v2v/v2v.ml:330
+#: ../v2v/v2v.ml:351
msgid ""
"multi-boot operating systems are not supported by virt-v2v. Use the --root "
"option to change how virt-v2v handles this."
@@ -2571,7 +2583,7 @@ msgid ""
"of this guest."
msgstr ""
-#: ../sysprep/main.ml:238
+#: ../sysprep/main.ml:248
msgid "no operating systems were found in the guest image"
msgstr ""
@@ -2579,7 +2591,7 @@ msgstr ""
msgid "no output from sha1sum command, see previous errors"
msgstr ""
-#: ../v2v/v2v.ml:300
+#: ../v2v/v2v.ml:321
msgid "no root device found in this operating system image."
msgstr ""
@@ -2589,7 +2601,7 @@ msgid ""
"fail when it tries to read the source disks."
msgstr ""
-#: ../v2v/v2v.ml:412
+#: ../v2v/v2v.ml:431
msgid ""
"not enough free space for conversion on filesystem '%s'. %Ld bytes free < "
"%Ld bytes needed"
@@ -2623,7 +2635,7 @@ msgstr ""
msgid "operation name is an empty string"
msgstr ""
-#: ../sysprep/main.ml:131
+#: ../sysprep/main.ml:138
msgid "operations"
msgstr ""
@@ -2631,7 +2643,7 @@ msgstr ""
msgid "option"
msgstr ""
-#: ../sysprep/main.ml:135
+#: ../sysprep/main.ml:142
msgid "opts"
msgstr ""
@@ -2682,7 +2694,7 @@ msgstr ""
msgid "pwrite: short write restoring swap partition header"
msgstr ""
-#: ../v2v/v2v.ml:279 ../v2v/v2v.ml:111
+#: ../v2v/v2v.ml:300 ../v2v/v2v.ml:111
msgid "qemu-img command failed, see earlier errors"
msgstr ""
@@ -2694,7 +2706,7 @@ msgstr ""
msgid "resize2fs"
msgstr ""
-#: ../v2v/v2v.ml:338
+#: ../v2v/v2v.ml:359
msgid "root device %s not found. Roots found were: %s"
msgstr ""
@@ -2820,9 +2832,9 @@ msgstr ""
msgid "unknown guest operating system: %s %s %d.%d (%s)"
msgstr ""
-#. ../customize/customize_main.ml:81
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:122 ../sysprep/main.ml:121
+#. ../customize/customize_main.ml:90
+#. ../customize/customize_main.ml:89
+#: ../sysprep/main.ml:129 ../sysprep/main.ml:128
msgid "uri"
msgstr ""
@@ -2992,7 +3004,7 @@ msgstr ""
msgid "virt-sysprep: script: killed by signal (%d)\n"
msgstr ""
-#: ../v2v/v2v.ml:201
+#: ../v2v/v2v.ml:222
msgid "virt-v2v is unable to convert this guest type (%s/%s)"
msgstr ""
@@ -3000,13 +3012,13 @@ msgstr ""
msgid "xfs_growfs"
msgstr ""
-#: ../sysprep/main.ml:184
+#: ../sysprep/main.ml:194
msgid ""
"you cannot give -a and -d options together. Read virt-sysprep(1) man page "
"for further information."
msgstr ""
-#: ../sysprep/main.ml:74
+#: ../sysprep/main.ml:81
msgid "you cannot pass an empty argument to --enable"
msgstr ""
@@ -3038,7 +3050,7 @@ msgstr ""
msgid "you cannot use the same disk image for input and output"
msgstr ""
-#: ../sysprep/main.ml:173
+#: ../sysprep/main.ml:183
msgid ""
"you must give either -a or -d options. Read virt-sysprep(1) man page for "
"further information."
@@ -3092,24 +3104,24 @@ msgstr ""
" -x Трасувати виклики API libguestfs\n"
"З докладнішими даними можна ознайомитися на сторінці довідника (man) %s(1).\n"
-#: align/scan.c:133 cat/cat.c:120 cat/filesystems.c:187 cat/log.c:122
-#: cat/ls.c:180 df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:136
-#: fish/fish.c:235 format/format.c:129 fuse/guestmount.c:210
-#: inspector/inspector.c:127 make-fs/make-fs.c:115 rescue/rescue.c:135
+#: align/scan.c:134 cat/cat.c:121 cat/filesystems.c:188 cat/log.c:123
+#: cat/ls.c:181 df/main.c:134 diff/diff.c:192 diff/diff.c:198 edit/edit.c:137
+#: fish/fish.c:236 format/format.c:130 fuse/guestmount.c:211
+#: inspector/inspector.c:128 make-fs/make-fs.c:115 rescue/rescue.c:136
#, c-format
msgid "guestfs_create: failed to create handle\n"
msgstr "guestfs_create: не вдалося створити елемент керування\n"
-#: align/scan.c:153 builder/index-validate.c:85 cat/cat.c:142
-#: cat/filesystems.c:241 cat/log.c:144 cat/ls.c:230 df/main.c:157
-#: diff/diff.c:262 edit/edit.c:158 fish/fish.c:293 format/format.c:183
-#: fuse/guestmount.c:251 fuse/guestunmount.c:124 inspector/inspector.c:151
-#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:192
+#: align/scan.c:151 builder/index-validate.c:85 cat/cat.c:140
+#: cat/filesystems.c:239 cat/log.c:142 cat/ls.c:228 df/main.c:155
+#: diff/diff.c:260 edit/edit.c:156 fish/fish.c:291 format/format.c:181
+#: fuse/guestmount.c:249 fuse/guestunmount.c:124 inspector/inspector.c:149
+#: make-fs/make-fs.c:142 p2v/main.c:130 rescue/rescue.c:190
#, c-format
msgid "%s: unknown long option: %s (%d)\n"
msgstr "%s: невідомий довгий запис параметра: %s (%d)\n"
-#: align/scan.c:173 df/main.c:185
+#: align/scan.c:171 df/main.c:183
#, c-format
msgid "%s: -P option is not numeric\n"
msgstr "%s: аргумент параметра -P не є числом\n"
@@ -3290,7 +3302,7 @@ msgstr ""
" -x Показати виклики програмного інтерфейсу libguestfs\n"
"Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
-#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:328
+#: cat/filesystems.c:303 cat/ls.c:343 df/main.c:262 diff/diff.c:326
#, c-format
msgid "%s: you cannot use -h and --csv options together.\n"
msgstr "%s: не можна одночасно використовувати параметри -h та --csv.\n"
@@ -3590,13 +3602,13 @@ msgstr ""
" --xattrs Вивести розширені записи атрибутів\n"
"Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
-#: diff/diff.c:319
+#: diff/diff.c:317
#, c-format
msgid "%s: you must specify some -a|-A|-d|-D options, see %s(1)\n"
msgstr ""
"%s: вам слід вказати якісь з параметрів -a, -A, -d або -D, див. %s(1)\n"
-#: diff/diff.c:334
+#: diff/diff.c:332
#, c-format
msgid "%s: extra arguments on the command line\n"
msgstr "%s: зайві аргументи у командному рядку\n"
@@ -3638,12 +3650,12 @@ msgid ""
"For more information, see the manpage %s(1).\n"
msgstr ""
-#: edit/edit.c:170
+#: edit/edit.c:168
#, c-format
msgid "%s: -b option given multiple times\n"
msgstr "%s: параметр -b вказано декілька разів\n"
-#: edit/edit.c:187
+#: edit/edit.c:185
#, c-format
msgid "%s: -e option given multiple times\n"
msgstr "%s: параметр -e вказано декілька разів\n"
@@ -6315,26 +6327,26 @@ msgstr ""
"\n"
"Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
-#: fish/fish.c:252
+#: fish/fish.c:253
#, c-format
msgid "%s: --listen=PID: PID was not a number: %s\n"
msgstr "%s: --listen=PID: PID не був числом: %s\n"
-#: fish/fish.c:259
+#: fish/fish.c:260
#, c-format
msgid ""
"%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
msgstr ""
"%s: remote: для ідентифікатора віддаленого процесу має $GUESTFISH_PID\n"
-#: fish/fish.c:312
+#: fish/fish.c:310
#, c-format
msgid "%s: warning: -D option is deprecated, use --no-dest-paths instead\n"
msgstr ""
"%s: попередження: параметр -D застарів, замість нього слід користуватися --"
"no-dest-paths\n"
-#: fish/fish.c:319
+#: fish/fish.c:317
#, c-format
msgid "%s: only one -f parameter can be given\n"
msgstr "%s: можна вказувати лише один параметр -f\n"
@@ -7024,12 +7036,12 @@ msgstr ""
"%s\n"
"\n"
-#: format/format.c:150
+#: format/format.c:148
#, c-format
msgid "%s: no filesystem was specified\n"
msgstr "%s: не вказано файлової системи\n"
-#: format/format.c:158
+#: format/format.c:156
#, c-format
msgid "%s: --lvm option cannot be given multiple times\n"
msgstr "%s: параметр --lvm можна визначати лише один раз\n"
@@ -7087,7 +7099,7 @@ msgid ""
" -x|--trace Trace guestfs API calls\n"
msgstr ""
-#: fuse/guestmount.c:246
+#: fuse/guestmount.c:244
#, c-format
msgid "%s: unable to parse --fd option value: %s\n"
msgstr ""
@@ -7709,27 +7721,27 @@ msgstr ""
" -x Трасувати виклики програмного інтерфейсу libguestfs\n"
"Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
-#: rescue/rescue.c:161
+#: rescue/rescue.c:159
#, c-format
msgid "%s: could not parse --smp parameter '%s'\n"
msgstr "%s: не вдалося обробити параметр --smp «%s»\n"
-#: rescue/rescue.c:166
+#: rescue/rescue.c:164
#, c-format
msgid "%s: --smp parameter '%s' should be >= 1\n"
msgstr "%s: значенням параметра --smp «%s» має бути число >= 1\n"
-#: rescue/rescue.c:179
+#: rescue/rescue.c:177
#, c-format
msgid "%s: could not parse --scratch parameter '%s'\n"
msgstr "%s: не вдалося обробити параметр --scratch, «%s»\n"
-#: rescue/rescue.c:185
+#: rescue/rescue.c:183
#, c-format
msgid "%s: --scratch parameter '%s' should be >= 1\n"
msgstr "%s: значенням у параметрі --scratch «%s» має бути число >= 1\n"
-#: rescue/rescue.c:212
+#: rescue/rescue.c:210
#, c-format
msgid "%s: could not parse memory size '%s'\n"
msgstr "%s: не вдалося обробити запис об’єму пам’яті «%s»\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list