diff --git a/BUGS b/BUGS
index 71513191a..f7346e067 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2013-12-12
+Last updated: 2013-12-14
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -233,9 +233,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1027526 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1027526
   RFE: Labels for logical partitions lost in Windows 2003 after virt-resize for primary partition
 
-1028666 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1028666
-  virt-builder fails if you select only --format but not --size: virt-resize: error: You cannot use --expand when there is no surplus [...]
-
 1028676 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1028676
   Add virt-builder to RHEL 7.1
 
@@ -251,6 +248,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1040912 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1040912
   [ARM] mount-local / FUSE support does not seem to work at all
 
+1041552 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1041552
+  virt-sysprep should remove Pegasus certificates
+
+1042780 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1042780
+  Support the virt-sysprep --delete option
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -272,7 +275,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 965495 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=965495
   New APIs required in libguestfs for virt-v2v in RHEL 6.5
 
-(84 bugs)
+(85 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
diff --git a/configure.ac b/configure.ac
index 4e2bc65ee..1955b5acc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [25])
-m4_define([libguestfs_release], [14])
+m4_define([libguestfs_release], [15])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 54d1dfb49..941821d9b 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/fedora/language/"
@@ -79392,6 +79392,11 @@ msgstr "Linux においては以下のファイルが削除されます:"
 #: ../sysprep/sysprep-operations.pod:153
 #, no-wrap
 msgid ""
+" /etc/Pegasus/*.cnf\n"
+" /etc/Pegasus/*.crt\n"
+" /etc/Pegasus/*.csr\n"
+" /etc/Pegasus/*.pem\n"
+" /etc/Pegasus/*.srl\n"
 " /root/anaconda-ks.cfg\n"
 " /root/anaconda-post.log\n"
 " /root/install.log\n"
@@ -79443,17 +79448,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:201
+#: ../sysprep/sysprep-operations.pod:206
 msgid "B<lvm-uuids> *"
 msgstr "B<lvm-uuids> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:204
+#: ../sysprep/sysprep-operations.pod:209
 msgid "Change LVM2 PV and VG UUIDs."
 msgstr "LVM2 の PV および VG の UUID を変更します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:206
+#: ../sysprep/sysprep-operations.pod:211
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs), new random UUIDs are generated and assigned to those PVs and VGs."
@@ -79463,17 +79468,17 @@ msgstr ""
 "れます。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:209
+#: ../sysprep/sysprep-operations.pod:214
 msgid "B<machine-id> *"
 msgstr "B<machine-id> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:212
+#: ../sysprep/sysprep-operations.pod:217
 msgid "Remove the local machine ID."
 msgstr "ローカルマシン ID を削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:214
+#: ../sysprep/sysprep-operations.pod:219
 msgid ""
 "The machine ID is usually generated from a random source during system "
 "installation and stays constant for all subsequent boots.  Optionally, for "
@@ -79482,27 +79487,27 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:219
+#: ../sysprep/sysprep-operations.pod:224
 msgid "B<mail-spool> *"
 msgstr "B<mail-spool> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:222
+#: ../sysprep/sysprep-operations.pod:227
 msgid "Remove email from the local mail spool directory."
 msgstr "ローカルのメールスプールのディレクトリから電子メールを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:224
+#: ../sysprep/sysprep-operations.pod:229
 msgid "B<net-hostname> *"
 msgstr "B<net-hostname> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:227
+#: ../sysprep/sysprep-operations.pod:232
 msgid "Remove HOSTNAME in network interface configuration."
 msgstr "ネットワークインターフェース設定にある HOSTNAME を削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:229 ../sysprep/sysprep-operations.pod:237
+#: ../sysprep/sysprep-operations.pod:234 ../sysprep/sysprep-operations.pod:242
 msgid ""
 "For Fedora and Red Hat Enterprise Linux, this is removed from C<ifcfg-*> "
 "files."
@@ -79511,27 +79516,27 @@ msgstr ""
 "ら削除されます。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:232
+#: ../sysprep/sysprep-operations.pod:237
 msgid "B<net-hwaddr> *"
 msgstr "B<net-hwaddr> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:235
+#: ../sysprep/sysprep-operations.pod:240
 msgid "Remove HWADDR (hard-coded MAC address) configuration."
 msgstr "HWADDR (ハードコードされた MAC アドレス) 設定を削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:240
+#: ../sysprep/sysprep-operations.pod:245
 msgid "B<pacct-log> *"
 msgstr "B<pacct-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:243
+#: ../sysprep/sysprep-operations.pod:248
 msgid "Remove the process accounting log files."
 msgstr "プロセス・アカウンティングのログファイルを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:245
+#: ../sysprep/sysprep-operations.pod:250
 msgid ""
 "The system wide process accounting will store to the pacct log files if the "
 "process accounting is on."
@@ -79540,170 +79545,170 @@ msgstr ""
 "ウンティングが pacct ログファイルに保存されます。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:248
+#: ../sysprep/sysprep-operations.pod:253
 msgid "B<package-manager-cache> *"
 msgstr "B<package-manager-cache> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:251
+#: ../sysprep/sysprep-operations.pod:256
 msgid "Remove package manager cache."
 msgstr "パッケージマネージャーのキャッシュを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:253
+#: ../sysprep/sysprep-operations.pod:258
 msgid "B<pam-data> *"
 msgstr "B<pam-data> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:256
+#: ../sysprep/sysprep-operations.pod:261
 msgid "Remove the PAM data in the guest."
 msgstr "ゲストにある PAM データを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:258
+#: ../sysprep/sysprep-operations.pod:263
 msgid "B<password> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:261
+#: ../sysprep/sysprep-operations.pod:266
 msgid "Set root or user password."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:263
+#: ../sysprep/sysprep-operations.pod:268
 msgid "Set root or another user's password."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:265
+#: ../sysprep/sysprep-operations.pod:270
 msgid ""
 "Use the I<--root-password> option to specify a replacement root password for "
 "the guest.  You can only use this option once."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:268
+#: ../sysprep/sysprep-operations.pod:273
 msgid ""
 "Use the I<--password> option to specify replacement user password(s).  You "
 "can use this option as many times as you want."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:271
+#: ../sysprep/sysprep-operations.pod:276
 msgid "Use I<--password-crypto> to change the password encryption used."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:273
+#: ../sysprep/sysprep-operations.pod:278
 msgid "See L</OPTIONS> above for details of these options."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:275
+#: ../sysprep/sysprep-operations.pod:280
 msgid ""
 "This operation is enabled by default, but it only does something if there is "
 "at least one I<--root-password> or I<--password> argument given."
 msgstr ""
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:279
+#: ../sysprep/sysprep-operations.pod:284
 msgid "Notes on password"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:281
+#: ../sysprep/sysprep-operations.pod:286
 msgid ""
 "Currently this only works for glibc-based Linux guests that use shadow "
 "passwords."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:284
+#: ../sysprep/sysprep-operations.pod:289
 msgid "B<puppet-data-log> *"
 msgstr "B<puppet-data-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:287
+#: ../sysprep/sysprep-operations.pod:292
 msgid "Remove the data and log files of puppet."
 msgstr "Puppet のデータおよびログファイルを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:289
+#: ../sysprep/sysprep-operations.pod:294
 msgid "B<random-seed> *"
 msgstr "B<random-seed> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:292
+#: ../sysprep/sysprep-operations.pod:297
 msgid "Generate random seed for guest."
 msgstr "仮想マシンに対して乱数種を生成します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:294
+#: ../sysprep/sysprep-operations.pod:299
 msgid ""
 "Write some random bytes from the host into the random seed file of the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:297
+#: ../sysprep/sysprep-operations.pod:302
 msgid "See L</RANDOM SEED> below."
 msgstr "以下の L</RANDOM SEED> を参照してください。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:299
+#: ../sysprep/sysprep-operations.pod:304
 msgid "B<rhn-systemid> *"
 msgstr "B<rhn-systemid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:302
+#: ../sysprep/sysprep-operations.pod:307
 msgid "Remove the RHN system ID."
 msgstr "RHN システム ID を削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:304
+#: ../sysprep/sysprep-operations.pod:309
 msgid "B<rpm-db> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:307
+#: ../sysprep/sysprep-operations.pod:312
 msgid "Remove host-specific RPM database files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:309
+#: ../sysprep/sysprep-operations.pod:314
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will recreate these "
 "files automatically if needed."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:312
+#: ../sysprep/sysprep-operations.pod:317
 msgid "B<samba-db-log> *"
 msgstr "B<samba-db-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:315
+#: ../sysprep/sysprep-operations.pod:320
 msgid "Remove the database and log files of Samba."
 msgstr "Samba のデータベースおよびログファイルを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:317
+#: ../sysprep/sysprep-operations.pod:322
 msgid "B<script> *"
 msgstr "B<script> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:320
+#: ../sysprep/sysprep-operations.pod:325
 msgid "Run arbitrary scripts against the guest."
 msgstr "仮想マシンに対して任意のスクリプトを実行します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:322
+#: ../sysprep/sysprep-operations.pod:327
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs "
 "against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:325
+#: ../sysprep/sysprep-operations.pod:330
 msgid ""
 "Note this feature requires FUSE support.  You may have to enable this in "
 "your host, for example by adding the current user to the C<fuse> group, or "
@@ -79711,14 +79716,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:329
+#: ../sysprep/sysprep-operations.pod:334
 msgid ""
 "Use one or more I<--script> parameters to specify scripts or programs that "
 "will be run against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:332
+#: ../sysprep/sysprep-operations.pod:337
 msgid ""
 "The script or program is run with its current directory being the guest's "
 "root directory, so relative paths should be used.  For example: C<rm etc/"
@@ -79727,14 +79732,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:338
+#: ../sysprep/sysprep-operations.pod:343
 msgid ""
 "Normally a temporary mount point for the guest is used, but you can choose a "
 "specific one by using the I<--scriptdir> parameter."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:341
+#: ../sysprep/sysprep-operations.pod:346
 msgid ""
 "B<Note:> This is different from I<--firstboot> scripts (which run in the "
 "context of the guest when it is booting first time).  I<--script> scripts "
@@ -79742,34 +79747,34 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:345
+#: ../sysprep/sysprep-operations.pod:350
 msgid "B<smolt-uuid> *"
 msgstr "B<smolt-uuid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:348
+#: ../sysprep/sysprep-operations.pod:353
 msgid "Remove the Smolt hardware UUID."
 msgstr "Smolt ハードウェア UUID を削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:350
+#: ../sysprep/sysprep-operations.pod:355
 msgid "B<ssh-hostkeys> *"
 msgstr "B<ssh-hostkeys> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:353
+#: ../sysprep/sysprep-operations.pod:358
 msgid "Remove the SSH host keys in the guest."
 msgstr "仮想マシンの SSH ホストキーを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:355
+#: ../sysprep/sysprep-operations.pod:360
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is "
 "booted."
 msgstr "仮想マシンの次回起動時に（異なる） SSH ホストキーが再生成されます。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:358
+#: ../sysprep/sysprep-operations.pod:363
 msgid ""
 "If, after cloning, the guest gets the same IP address, ssh will give you a "
 "stark warning about the host key changing:"
@@ -79778,7 +79783,7 @@ msgstr ""
 "という警告が ssh により表示されます:"
 
 #. type: verbatim
-#: ../sysprep/sysprep-operations.pod:361
+#: ../sysprep/sysprep-operations.pod:366
 #, no-wrap
 msgid ""
 " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -79794,17 +79799,17 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:366
+#: ../sysprep/sysprep-operations.pod:371
 msgid "B<ssh-userdir> *"
 msgstr "B<ssh-userdir> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:369
+#: ../sysprep/sysprep-operations.pod:374
 msgid "Remove \".ssh\" directories in the guest."
 msgstr "仮想マシンにある \".ssh\" ディレクトリーを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:371
+#: ../sysprep/sysprep-operations.pod:376
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other users who have a "
 "C<.ssh> directory in their home directory."
@@ -79813,12 +79818,12 @@ msgstr ""
 "他のすべてのユーザーの、C<.ssh> ディレクトリーを削除します。"
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:374
+#: ../sysprep/sysprep-operations.pod:379
 msgid "Notes on ssh-userdir"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:376
+#: ../sysprep/sysprep-operations.pod:381
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for home directories, "
 "so users with home directories in other locations won't have the ssh files "
@@ -79826,49 +79831,49 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:380
+#: ../sysprep/sysprep-operations.pod:385
 msgid "B<sssd-db-log> *"
 msgstr "B<sssd-db-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:383
+#: ../sysprep/sysprep-operations.pod:388
 msgid "Remove the database and log files of sssd."
 msgstr "SSSD のデータベースとログファイルを削除します。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:385
+#: ../sysprep/sysprep-operations.pod:390
 msgid "B<tmp-files> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:388
+#: ../sysprep/sysprep-operations.pod:393
 msgid "Remove temporary files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:390
+#: ../sysprep/sysprep-operations.pod:395
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:392
+#: ../sysprep/sysprep-operations.pod:397
 msgid "B<udev-persistent-net> *"
 msgstr "B<udev-persistent-net> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:395
+#: ../sysprep/sysprep-operations.pod:400
 msgid "Remove udev persistent net rules."
 msgstr "udev persistent net ルールを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:397
+#: ../sysprep/sysprep-operations.pod:402
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC address "
 "to a fixed ethernet device (eg. eth0)."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:400
+#: ../sysprep/sysprep-operations.pod:405
 msgid ""
 "After a guest is cloned, the MAC address usually changes.  Since the old MAC "
 "address occupies the old name (eg. eth0), this means the fresh MAC address "
@@ -79882,17 +79887,17 @@ msgstr ""
 "ます。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:405
+#: ../sysprep/sysprep-operations.pod:410
 msgid "B<user-account>"
 msgstr "B<user-account>"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:407
+#: ../sysprep/sysprep-operations.pod:412
 msgid "Remove the user accounts in the guest."
 msgstr "仮想マシンにあるユーザーアカウントを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:409
+#: ../sysprep/sysprep-operations.pod:414
 msgid ""
 "Remove all the user accounts and their home directories.  The \"root\" "
 "account is not removed."
@@ -79901,29 +79906,29 @@ msgstr ""
 "\" アカウントは削除されません。"
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:412
+#: ../sysprep/sysprep-operations.pod:417
 msgid "Notes on user-account"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:414
+#: ../sysprep/sysprep-operations.pod:419
 msgid ""
 "Currently this does not remove the user accounts from C</etc/shadow>.  This "
 "is because there is no lens for the shadow password file in Augeas."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:418
+#: ../sysprep/sysprep-operations.pod:423
 msgid "B<utmp> *"
 msgstr "B<utmp> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:421
+#: ../sysprep/sysprep-operations.pod:426
 msgid "Remove the utmp file."
 msgstr "utmp ファイルを削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:423
+#: ../sysprep/sysprep-operations.pod:428
 msgid ""
 "This file records who is currently logged in on a machine.  In modern Linux "
 "distros it is stored in a ramdisk and hence not part of the virtual "
@@ -79934,17 +79939,17 @@ msgstr ""
 "ません。しかし、古いディストリビューションは、ディスクに保存していました。"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:427
+#: ../sysprep/sysprep-operations.pod:432
 msgid "B<yum-uuid> *"
 msgstr "B<yum-uuid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:430
+#: ../sysprep/sysprep-operations.pod:435
 msgid "Remove the yum UUID."
 msgstr "yum UUID を削除します。"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:432
+#: ../sysprep/sysprep-operations.pod:437
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the "
 "original UUID has been erased."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index de0c256d1..d9197334c 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.25.14\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70381,6 +70381,11 @@ msgstr ""
 #: ../sysprep/sysprep-operations.pod:153
 #, no-wrap
 msgid ""
+" /etc/Pegasus/*.cnf\n"
+" /etc/Pegasus/*.crt\n"
+" /etc/Pegasus/*.csr\n"
+" /etc/Pegasus/*.pem\n"
+" /etc/Pegasus/*.srl\n"
 " /root/anaconda-ks.cfg\n"
 " /root/anaconda-post.log\n"
 " /root/install.log\n"
@@ -70432,34 +70437,34 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:201
+#: ../sysprep/sysprep-operations.pod:206
 msgid "B<lvm-uuids> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:204
+#: ../sysprep/sysprep-operations.pod:209
 msgid "Change LVM2 PV and VG UUIDs."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:206
+#: ../sysprep/sysprep-operations.pod:211
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs), new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:209
+#: ../sysprep/sysprep-operations.pod:214
 msgid "B<machine-id> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:212
+#: ../sysprep/sysprep-operations.pod:217
 msgid "Remove the local machine ID."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:214
+#: ../sysprep/sysprep-operations.pod:219
 msgid ""
 "The machine ID is usually generated from a random source during system "
 "installation and stays constant for all subsequent boots.  Optionally, for "
@@ -70468,225 +70473,225 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:219
+#: ../sysprep/sysprep-operations.pod:224
 msgid "B<mail-spool> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:222
+#: ../sysprep/sysprep-operations.pod:227
 msgid "Remove email from the local mail spool directory."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:224
+#: ../sysprep/sysprep-operations.pod:229
 msgid "B<net-hostname> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:227
+#: ../sysprep/sysprep-operations.pod:232
 msgid "Remove HOSTNAME in network interface configuration."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:229 ../sysprep/sysprep-operations.pod:237
+#: ../sysprep/sysprep-operations.pod:234 ../sysprep/sysprep-operations.pod:242
 msgid ""
 "For Fedora and Red Hat Enterprise Linux, this is removed from C<ifcfg-*> "
 "files."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:232
+#: ../sysprep/sysprep-operations.pod:237
 msgid "B<net-hwaddr> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:235
+#: ../sysprep/sysprep-operations.pod:240
 msgid "Remove HWADDR (hard-coded MAC address) configuration."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:240
+#: ../sysprep/sysprep-operations.pod:245
 msgid "B<pacct-log> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:243
+#: ../sysprep/sysprep-operations.pod:248
 msgid "Remove the process accounting log files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:245
+#: ../sysprep/sysprep-operations.pod:250
 msgid ""
 "The system wide process accounting will store to the pacct log files if the "
 "process accounting is on."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:248
+#: ../sysprep/sysprep-operations.pod:253
 msgid "B<package-manager-cache> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:251
+#: ../sysprep/sysprep-operations.pod:256
 msgid "Remove package manager cache."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:253
+#: ../sysprep/sysprep-operations.pod:258
 msgid "B<pam-data> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:256
+#: ../sysprep/sysprep-operations.pod:261
 msgid "Remove the PAM data in the guest."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:258
+#: ../sysprep/sysprep-operations.pod:263
 msgid "B<password> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:261
+#: ../sysprep/sysprep-operations.pod:266
 msgid "Set root or user password."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:263
+#: ../sysprep/sysprep-operations.pod:268
 msgid "Set root or another user's password."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:265
+#: ../sysprep/sysprep-operations.pod:270
 msgid ""
 "Use the I<--root-password> option to specify a replacement root password for "
 "the guest.  You can only use this option once."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:268
+#: ../sysprep/sysprep-operations.pod:273
 msgid ""
 "Use the I<--password> option to specify replacement user password(s).  You "
 "can use this option as many times as you want."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:271
+#: ../sysprep/sysprep-operations.pod:276
 msgid "Use I<--password-crypto> to change the password encryption used."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:273
+#: ../sysprep/sysprep-operations.pod:278
 msgid "See L</OPTIONS> above for details of these options."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:275
+#: ../sysprep/sysprep-operations.pod:280
 msgid ""
 "This operation is enabled by default, but it only does something if there is "
 "at least one I<--root-password> or I<--password> argument given."
 msgstr ""
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:279
+#: ../sysprep/sysprep-operations.pod:284
 msgid "Notes on password"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:281
+#: ../sysprep/sysprep-operations.pod:286
 msgid ""
 "Currently this only works for glibc-based Linux guests that use shadow "
 "passwords."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:284
+#: ../sysprep/sysprep-operations.pod:289
 msgid "B<puppet-data-log> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:287
+#: ../sysprep/sysprep-operations.pod:292
 msgid "Remove the data and log files of puppet."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:289
+#: ../sysprep/sysprep-operations.pod:294
 msgid "B<random-seed> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:292
+#: ../sysprep/sysprep-operations.pod:297
 msgid "Generate random seed for guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:294
+#: ../sysprep/sysprep-operations.pod:299
 msgid ""
 "Write some random bytes from the host into the random seed file of the "
 "guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:297
+#: ../sysprep/sysprep-operations.pod:302
 msgid "See L</RANDOM SEED> below."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:299
+#: ../sysprep/sysprep-operations.pod:304
 msgid "B<rhn-systemid> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:302
+#: ../sysprep/sysprep-operations.pod:307
 msgid "Remove the RHN system ID."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:304
+#: ../sysprep/sysprep-operations.pod:309
 msgid "B<rpm-db> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:307
+#: ../sysprep/sysprep-operations.pod:312
 msgid "Remove host-specific RPM database files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:309
+#: ../sysprep/sysprep-operations.pod:314
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will recreate these "
 "files automatically if needed."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:312
+#: ../sysprep/sysprep-operations.pod:317
 msgid "B<samba-db-log> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:315
+#: ../sysprep/sysprep-operations.pod:320
 msgid "Remove the database and log files of Samba."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:317
+#: ../sysprep/sysprep-operations.pod:322
 msgid "B<script> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:320
+#: ../sysprep/sysprep-operations.pod:325
 msgid "Run arbitrary scripts against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:322
+#: ../sysprep/sysprep-operations.pod:327
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs "
 "against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:325
+#: ../sysprep/sysprep-operations.pod:330
 msgid ""
 "Note this feature requires FUSE support.  You may have to enable this in "
 "your host, for example by adding the current user to the C<fuse> group, or "
@@ -70694,14 +70699,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:329
+#: ../sysprep/sysprep-operations.pod:334
 msgid ""
 "Use one or more I<--script> parameters to specify scripts or programs that "
 "will be run against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:332
+#: ../sysprep/sysprep-operations.pod:337
 msgid ""
 "The script or program is run with its current directory being the guest's "
 "root directory, so relative paths should be used.  For example: C<rm "
@@ -70711,14 +70716,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:338
+#: ../sysprep/sysprep-operations.pod:343
 msgid ""
 "Normally a temporary mount point for the guest is used, but you can choose a "
 "specific one by using the I<--scriptdir> parameter."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:341
+#: ../sysprep/sysprep-operations.pod:346
 msgid ""
 "B<Note:> This is different from I<--firstboot> scripts (which run in the "
 "context of the guest when it is booting first time).  I<--script> scripts "
@@ -70726,41 +70731,41 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:345
+#: ../sysprep/sysprep-operations.pod:350
 msgid "B<smolt-uuid> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:348
+#: ../sysprep/sysprep-operations.pod:353
 msgid "Remove the Smolt hardware UUID."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:350
+#: ../sysprep/sysprep-operations.pod:355
 msgid "B<ssh-hostkeys> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:353
+#: ../sysprep/sysprep-operations.pod:358
 msgid "Remove the SSH host keys in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:355
+#: ../sysprep/sysprep-operations.pod:360
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is "
 "booted."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:358
+#: ../sysprep/sysprep-operations.pod:363
 msgid ""
 "If, after cloning, the guest gets the same IP address, ssh will give you a "
 "stark warning about the host key changing:"
 msgstr ""
 
 #. type: verbatim
-#: ../sysprep/sysprep-operations.pod:361
+#: ../sysprep/sysprep-operations.pod:366
 #, no-wrap
 msgid ""
 " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -70771,29 +70776,29 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:366
+#: ../sysprep/sysprep-operations.pod:371
 msgid "B<ssh-userdir> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:369
+#: ../sysprep/sysprep-operations.pod:374
 msgid "Remove \".ssh\" directories in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:371
+#: ../sysprep/sysprep-operations.pod:376
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other users who have a "
 "C<.ssh> directory in their home directory."
 msgstr ""
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:374
+#: ../sysprep/sysprep-operations.pod:379
 msgid "Notes on ssh-userdir"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:376
+#: ../sysprep/sysprep-operations.pod:381
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for home directories, "
 "so users with home directories in other locations won't have the ssh files "
@@ -70801,49 +70806,49 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:380
+#: ../sysprep/sysprep-operations.pod:385
 msgid "B<sssd-db-log> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:383
+#: ../sysprep/sysprep-operations.pod:388
 msgid "Remove the database and log files of sssd."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:385
+#: ../sysprep/sysprep-operations.pod:390
 msgid "B<tmp-files> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:388
+#: ../sysprep/sysprep-operations.pod:393
 msgid "Remove temporary files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:390
+#: ../sysprep/sysprep-operations.pod:395
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:392
+#: ../sysprep/sysprep-operations.pod:397
 msgid "B<udev-persistent-net> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:395
+#: ../sysprep/sysprep-operations.pod:400
 msgid "Remove udev persistent net rules."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:397
+#: ../sysprep/sysprep-operations.pod:402
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC address "
 "to a fixed ethernet device (eg. eth0)."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:400
+#: ../sysprep/sysprep-operations.pod:405
 msgid ""
 "After a guest is cloned, the MAC address usually changes.  Since the old MAC "
 "address occupies the old name (eg. eth0), this means the fresh MAC address "
@@ -70852,46 +70857,46 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:405
+#: ../sysprep/sysprep-operations.pod:410
 msgid "B<user-account>"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:407
+#: ../sysprep/sysprep-operations.pod:412
 msgid "Remove the user accounts in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:409
+#: ../sysprep/sysprep-operations.pod:414
 msgid ""
 "Remove all the user accounts and their home directories.  The \"root\" "
 "account is not removed."
 msgstr ""
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:412
+#: ../sysprep/sysprep-operations.pod:417
 msgid "Notes on user-account"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:414
+#: ../sysprep/sysprep-operations.pod:419
 msgid ""
 "Currently this does not remove the user accounts from C</etc/shadow>.  This "
 "is because there is no lens for the shadow password file in Augeas."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:418
+#: ../sysprep/sysprep-operations.pod:423
 msgid "B<utmp> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:421
+#: ../sysprep/sysprep-operations.pod:426
 msgid "Remove the utmp file."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:423
+#: ../sysprep/sysprep-operations.pod:428
 msgid ""
 "This file records who is currently logged in on a machine.  In modern Linux "
 "distros it is stored in a ramdisk and hence not part of the virtual "
@@ -70899,17 +70904,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:427
+#: ../sysprep/sysprep-operations.pod:432
 msgid "B<yum-uuid> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:430
+#: ../sysprep/sysprep-operations.pod:435
 msgid "Remove the yum UUID."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:432
+#: ../sysprep/sysprep-operations.pod:437
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the "
 "original UUID has been erased."
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 9f2d8df2c..dee052ee8 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/fedora/"
@@ -77546,6 +77546,11 @@ msgstr "У Linux вилучено такі файли:"
 #: ../sysprep/sysprep-operations.pod:153
 #, no-wrap
 msgid ""
+" /etc/Pegasus/*.cnf\n"
+" /etc/Pegasus/*.crt\n"
+" /etc/Pegasus/*.csr\n"
+" /etc/Pegasus/*.pem\n"
+" /etc/Pegasus/*.srl\n"
 " /root/anaconda-ks.cfg\n"
 " /root/anaconda-post.log\n"
 " /root/install.log\n"
@@ -77597,17 +77602,17 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:201
+#: ../sysprep/sysprep-operations.pod:206
 msgid "B<lvm-uuids> *"
 msgstr "B<lvm-uuids> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:204
+#: ../sysprep/sysprep-operations.pod:209
 msgid "Change LVM2 PV and VG UUIDs."
 msgstr "Змінити UUID ФТ і ГТ LVM2."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:206
+#: ../sysprep/sysprep-operations.pod:211
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs), new random UUIDs are generated and assigned to those PVs and VGs."
@@ -77616,17 +77621,17 @@ msgstr ""
 "(ГТ) LVM2 для ФТ і ГТ буде створено і призначено випадкові UUID."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:209
+#: ../sysprep/sysprep-operations.pod:214
 msgid "B<machine-id> *"
 msgstr "B<ід-комп’ютера> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:212
+#: ../sysprep/sysprep-operations.pod:217
 msgid "Remove the local machine ID."
 msgstr "Вилучити ідентифікатор локального комп’ютера."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:214
+#: ../sysprep/sysprep-operations.pod:219
 msgid ""
 "The machine ID is usually generated from a random source during system "
 "installation and stays constant for all subsequent boots.  Optionally, for "
@@ -77640,27 +77645,27 @@ msgstr ""
 "якщо буде виявлено порожнє значення."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:219
+#: ../sysprep/sysprep-operations.pod:224
 msgid "B<mail-spool> *"
 msgstr "B<mail-spool> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:222
+#: ../sysprep/sysprep-operations.pod:227
 msgid "Remove email from the local mail spool directory."
 msgstr "Вилучити поштове повідомлення з локального каталогу поштового буфера."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:224
+#: ../sysprep/sysprep-operations.pod:229
 msgid "B<net-hostname> *"
 msgstr "B<net-hostname> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:227
+#: ../sysprep/sysprep-operations.pod:232
 msgid "Remove HOSTNAME in network interface configuration."
 msgstr "Вилучити HOSTNAME у налаштуваннях інтерфейсу мережі."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:229 ../sysprep/sysprep-operations.pod:237
+#: ../sysprep/sysprep-operations.pod:234 ../sysprep/sysprep-operations.pod:242
 msgid ""
 "For Fedora and Red Hat Enterprise Linux, this is removed from C<ifcfg-*> "
 "files."
@@ -77668,27 +77673,27 @@ msgstr ""
 "Для Fedora і Red Hat Enterprise Linux це вилучається з файлів C<ifcfg-*>."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:232
+#: ../sysprep/sysprep-operations.pod:237
 msgid "B<net-hwaddr> *"
 msgstr "B<net-hwaddr> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:235
+#: ../sysprep/sysprep-operations.pod:240
 msgid "Remove HWADDR (hard-coded MAC address) configuration."
 msgstr "Вилучити налаштування HWADDR (апаратної адреси MAC)."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:240
+#: ../sysprep/sysprep-operations.pod:245
 msgid "B<pacct-log> *"
 msgstr "B<pacct-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:243
+#: ../sysprep/sysprep-operations.pod:248
 msgid "Remove the process accounting log files."
 msgstr "Вилучити файли журналу обліку процесів."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:245
+#: ../sysprep/sysprep-operations.pod:250
 msgid ""
 "The system wide process accounting will store to the pacct log files if the "
 "process accounting is on."
@@ -77697,78 +77702,78 @@ msgstr ""
 "увімкнено облік процесів."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:248
+#: ../sysprep/sysprep-operations.pod:253
 msgid "B<package-manager-cache> *"
 msgstr "B<package-manager-cache> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:251
+#: ../sysprep/sysprep-operations.pod:256
 msgid "Remove package manager cache."
 msgstr "Вилучити кеш керування пакунками."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:253
+#: ../sysprep/sysprep-operations.pod:258
 msgid "B<pam-data> *"
 msgstr "B<pam-data> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:256
+#: ../sysprep/sysprep-operations.pod:261
 msgid "Remove the PAM data in the guest."
 msgstr "Вилучити дані PAM у гостьовій системі."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:258
+#: ../sysprep/sysprep-operations.pod:263
 msgid "B<password> *"
 msgstr "B<password> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:261
+#: ../sysprep/sysprep-operations.pod:266
 msgid "Set root or user password."
 msgstr "Встановити пароль root або користувача."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:263
+#: ../sysprep/sysprep-operations.pod:268
 msgid "Set root or another user's password."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:265
+#: ../sysprep/sysprep-operations.pod:270
 msgid ""
 "Use the I<--root-password> option to specify a replacement root password for "
 "the guest.  You can only use this option once."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:268
+#: ../sysprep/sysprep-operations.pod:273
 msgid ""
 "Use the I<--password> option to specify replacement user password(s).  You "
 "can use this option as many times as you want."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:271
+#: ../sysprep/sysprep-operations.pod:276
 msgid "Use I<--password-crypto> to change the password encryption used."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:273
+#: ../sysprep/sysprep-operations.pod:278
 msgid "See L</OPTIONS> above for details of these options."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:275
+#: ../sysprep/sysprep-operations.pod:280
 msgid ""
 "This operation is enabled by default, but it only does something if there is "
 "at least one I<--root-password> or I<--password> argument given."
 msgstr ""
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:279
+#: ../sysprep/sysprep-operations.pod:284
 msgid "Notes on password"
 msgstr "Зауваження щодо password"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:281
+#: ../sysprep/sysprep-operations.pod:286
 msgid ""
 "Currently this only works for glibc-based Linux guests that use shadow "
 "passwords."
@@ -77777,27 +77782,27 @@ msgstr ""
 "заснованих на glibc, у яких використовуються паролі shadow."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:284
+#: ../sysprep/sysprep-operations.pod:289
 msgid "B<puppet-data-log> *"
 msgstr "B<puppet-data-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:287
+#: ../sysprep/sysprep-operations.pod:292
 msgid "Remove the data and log files of puppet."
 msgstr "Вилучити дані та файли журналів puppet."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:289
+#: ../sysprep/sysprep-operations.pod:294
 msgid "B<random-seed> *"
 msgstr "B<random-seed> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:292
+#: ../sysprep/sysprep-operations.pod:297
 msgid "Generate random seed for guest."
 msgstr "Створити породжувач випадкових чисел для гостьової системи."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:294
+#: ../sysprep/sysprep-operations.pod:299
 msgid ""
 "Write some random bytes from the host into the random seed file of the guest."
 msgstr ""
@@ -77805,32 +77810,32 @@ msgstr ""
 "псевдовипадкових чисел у гостьовій системі."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:297
+#: ../sysprep/sysprep-operations.pod:302
 msgid "See L</RANDOM SEED> below."
 msgstr "Див. L</RANDOM SEED> нижче."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:299
+#: ../sysprep/sysprep-operations.pod:304
 msgid "B<rhn-systemid> *"
 msgstr "B<rhn-systemid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:302
+#: ../sysprep/sysprep-operations.pod:307
 msgid "Remove the RHN system ID."
 msgstr "Вилучити ідентифікатор системи у RHN."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:304
+#: ../sysprep/sysprep-operations.pod:309
 msgid "B<rpm-db> *"
 msgstr "B<rpm-db> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:307
+#: ../sysprep/sysprep-operations.pod:312
 msgid "Remove host-specific RPM database files."
 msgstr "Вилучити специфічні для системи файли баз даних RPM."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:309
+#: ../sysprep/sysprep-operations.pod:314
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will recreate these "
 "files automatically if needed."
@@ -77839,34 +77844,34 @@ msgstr ""
 "створено ці файли, якщо це потрібно."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:312
+#: ../sysprep/sysprep-operations.pod:317
 msgid "B<samba-db-log> *"
 msgstr "B<samba-db-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:315
+#: ../sysprep/sysprep-operations.pod:320
 msgid "Remove the database and log files of Samba."
 msgstr "Вилучити бази даних та файли журналів Samba."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:317
+#: ../sysprep/sysprep-operations.pod:322
 msgid "B<script> *"
 msgstr "B<script> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:320
+#: ../sysprep/sysprep-operations.pod:325
 msgid "Run arbitrary scripts against the guest."
 msgstr "Запустити довільні скрипти дій над гостьовою системою."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:322
+#: ../sysprep/sysprep-operations.pod:327
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs "
 "against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:325
+#: ../sysprep/sysprep-operations.pod:330
 msgid ""
 "Note this feature requires FUSE support.  You may have to enable this in "
 "your host, for example by adding the current user to the C<fuse> group, or "
@@ -77874,14 +77879,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:329
+#: ../sysprep/sysprep-operations.pod:334
 msgid ""
 "Use one or more I<--script> parameters to specify scripts or programs that "
 "will be run against the guest."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:332
+#: ../sysprep/sysprep-operations.pod:337
 msgid ""
 "The script or program is run with its current directory being the guest's "
 "root directory, so relative paths should be used.  For example: C<rm etc/"
@@ -77890,14 +77895,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:338
+#: ../sysprep/sysprep-operations.pod:343
 msgid ""
 "Normally a temporary mount point for the guest is used, but you can choose a "
 "specific one by using the I<--scriptdir> parameter."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:341
+#: ../sysprep/sysprep-operations.pod:346
 msgid ""
 "B<Note:> This is different from I<--firstboot> scripts (which run in the "
 "context of the guest when it is booting first time).  I<--script> scripts "
@@ -77905,27 +77910,27 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:345
+#: ../sysprep/sysprep-operations.pod:350
 msgid "B<smolt-uuid> *"
 msgstr "B<smolt-uuid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:348
+#: ../sysprep/sysprep-operations.pod:353
 msgid "Remove the Smolt hardware UUID."
 msgstr "Вилучити UUID обладнання Smolt."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:350
+#: ../sysprep/sysprep-operations.pod:355
 msgid "B<ssh-hostkeys> *"
 msgstr "B<ssh-hostkeys> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:353
+#: ../sysprep/sysprep-operations.pod:358
 msgid "Remove the SSH host keys in the guest."
 msgstr "Вилучити ключі вузла SSH у гостьовій системі."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:355
+#: ../sysprep/sysprep-operations.pod:360
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is "
 "booted."
@@ -77934,7 +77939,7 @@ msgstr ""
 "завантаження гостьової системи."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:358
+#: ../sysprep/sysprep-operations.pod:363
 msgid ""
 "If, after cloning, the guest gets the same IP address, ssh will give you a "
 "stark warning about the host key changing:"
@@ -77943,7 +77948,7 @@ msgstr ""
 "надасть вам додаткове попередження щодо зміни ключа вузла:"
 
 #. type: verbatim
-#: ../sysprep/sysprep-operations.pod:361
+#: ../sysprep/sysprep-operations.pod:366
 #, no-wrap
 msgid ""
 " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
@@ -77959,17 +77964,17 @@ msgstr ""
 "\n"
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:366
+#: ../sysprep/sysprep-operations.pod:371
 msgid "B<ssh-userdir> *"
 msgstr "B<ssh-userdir> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:369
+#: ../sysprep/sysprep-operations.pod:374
 msgid "Remove \".ssh\" directories in the guest."
 msgstr "Вилучити каталоги «.ssh» у гостьовій системі."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:371
+#: ../sysprep/sysprep-operations.pod:376
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other users who have a "
 "C<.ssh> directory in their home directory."
@@ -77978,12 +77983,12 @@ msgstr ""
 "домашні каталоги яких містять каталог C<.ssh>."
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:374
+#: ../sysprep/sysprep-operations.pod:379
 msgid "Notes on ssh-userdir"
 msgstr "Зауваження щодо ssh-userdir"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:376
+#: ../sysprep/sysprep-operations.pod:381
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for home directories, "
 "so users with home directories in other locations won't have the ssh files "
@@ -77994,42 +77999,42 @@ msgstr ""
 "у інших каталогах, не буде вилучено."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:380
+#: ../sysprep/sysprep-operations.pod:385
 msgid "B<sssd-db-log> *"
 msgstr "B<sssd-db-log> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:383
+#: ../sysprep/sysprep-operations.pod:388
 msgid "Remove the database and log files of sssd."
 msgstr "Вилучити бази даних і файли журналів sssd."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:385
+#: ../sysprep/sysprep-operations.pod:390
 msgid "B<tmp-files> *"
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:388
+#: ../sysprep/sysprep-operations.pod:393
 msgid "Remove temporary files."
 msgstr ""
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:390
+#: ../sysprep/sysprep-operations.pod:395
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:392
+#: ../sysprep/sysprep-operations.pod:397
 msgid "B<udev-persistent-net> *"
 msgstr "B<udev-persistent-net> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:395
+#: ../sysprep/sysprep-operations.pod:400
 msgid "Remove udev persistent net rules."
 msgstr "Вилучити постійні правила мережі udev."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:397
+#: ../sysprep/sysprep-operations.pod:402
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC address "
 "to a fixed ethernet device (eg. eth0)."
@@ -78038,7 +78043,7 @@ msgstr ""
 "адресу гостьової системи на фіксований пристрій ethernet (наприклад eth0)."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:400
+#: ../sysprep/sysprep-operations.pod:405
 msgid ""
 "After a guest is cloned, the MAC address usually changes.  Since the old MAC "
 "address occupies the old name (eg. eth0), this means the fresh MAC address "
@@ -78052,17 +78057,17 @@ msgstr ""
 "udev цьому можна запобігти."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:405
+#: ../sysprep/sysprep-operations.pod:410
 msgid "B<user-account>"
 msgstr "B<user-account>"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:407
+#: ../sysprep/sysprep-operations.pod:412
 msgid "Remove the user accounts in the guest."
 msgstr "Вилучити облікові записи користувачів у гостьовій системі."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:409
+#: ../sysprep/sysprep-operations.pod:414
 msgid ""
 "Remove all the user accounts and their home directories.  The \"root\" "
 "account is not removed."
@@ -78071,12 +78076,12 @@ msgstr ""
 "Обліковий запис «root» вилучено не буде."
 
 #. type: =head3
-#: ../sysprep/sysprep-operations.pod:412
+#: ../sysprep/sysprep-operations.pod:417
 msgid "Notes on user-account"
 msgstr "Зауваження щодо user-account"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:414
+#: ../sysprep/sysprep-operations.pod:419
 msgid ""
 "Currently this does not remove the user accounts from C</etc/shadow>.  This "
 "is because there is no lens for the shadow password file in Augeas."
@@ -78085,17 +78090,17 @@ msgstr ""
 "Причиною є те, що у Augeas ще немає модуля для файлів паролів shadow."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:418
+#: ../sysprep/sysprep-operations.pod:423
 msgid "B<utmp> *"
 msgstr "B<utmp> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:421
+#: ../sysprep/sysprep-operations.pod:426
 msgid "Remove the utmp file."
 msgstr "Вилучити файл utmp."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:423
+#: ../sysprep/sysprep-operations.pod:428
 msgid ""
 "This file records who is currently logged in on a machine.  In modern Linux "
 "distros it is stored in a ramdisk and hence not part of the virtual "
@@ -78107,17 +78112,17 @@ msgstr ""
 "у старіших версіях дистрибутивів."
 
 #. type: =head2
-#: ../sysprep/sysprep-operations.pod:427
+#: ../sysprep/sysprep-operations.pod:432
 msgid "B<yum-uuid> *"
 msgstr "B<yum-uuid> *"
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:430
+#: ../sysprep/sysprep-operations.pod:435
 msgid "Remove the yum UUID."
 msgstr "Вилучити UUID yum."
 
 #. type: textblock
-#: ../sysprep/sysprep-operations.pod:432
+#: ../sysprep/sysprep-operations.pod:437
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the "
 "original UUID has been erased."
diff --git a/po/en_GB.po b/po/en_GB.po
index b8e3bb8e9..0fe4a8caf 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/es.po b/po/es.po
index 5c7e4029a..b482da7fe 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -98,19 +98,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -209,26 +205,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -237,15 +229,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -259,15 +247,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -287,11 +275,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -310,7 +298,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -320,6 +308,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -373,7 +368,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -458,19 +453,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -484,7 +479,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -585,13 +580,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -607,10 +610,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -688,7 +687,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -766,7 +765,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -815,13 +814,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -859,11 +858,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -904,7 +903,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -934,19 +933,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -967,7 +966,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1015,7 +1014,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1028,7 +1027,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1036,7 +1035,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1044,6 +1051,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1112,7 +1123,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1229,7 +1240,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1239,6 +1250,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1275,15 +1294,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1299,11 +1310,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1491,7 +1502,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1501,15 +1512,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1666,7 +1677,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1674,15 +1685,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1698,7 +1709,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1766,15 +1777,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2155,7 +2166,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/gu.po b/po/gu.po
index 471abfbee..e8a9bcee4 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/hi.po b/po/hi.po
index 438db987a..913112026 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/kn.po b/po/kn.po
index 9ad632cb5..f55b5c0af 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index f2f361ed2..f5333ec46 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.25.14\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -96,19 +96,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -207,26 +203,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -235,15 +227,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -257,15 +245,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -285,11 +273,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -308,7 +296,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -318,6 +306,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -371,7 +366,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -456,19 +451,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -482,7 +477,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -583,13 +578,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -605,10 +608,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -686,7 +685,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -764,7 +763,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -813,13 +812,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -857,11 +856,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -902,7 +901,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -932,19 +931,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -965,7 +964,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1013,7 +1012,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1026,7 +1025,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1034,7 +1033,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1042,6 +1049,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1110,7 +1121,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1227,7 +1238,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1237,6 +1248,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1273,15 +1292,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1297,11 +1308,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1489,7 +1500,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1499,15 +1510,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1664,7 +1675,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1672,15 +1683,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1696,7 +1707,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1764,15 +1775,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2153,7 +2164,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/ml.po b/po/ml.po
index ef1737790..bca6e44ae 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -96,19 +96,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -207,26 +203,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -235,15 +227,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -257,15 +245,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -285,11 +273,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -308,7 +296,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -318,6 +306,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -371,7 +366,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -456,19 +451,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -482,7 +477,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -583,13 +578,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -605,10 +608,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -686,7 +685,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -764,7 +763,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -813,13 +812,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -857,11 +856,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -902,7 +901,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -932,19 +931,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -965,7 +964,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1013,7 +1012,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1026,7 +1025,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1034,7 +1033,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1042,6 +1049,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1110,7 +1121,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1227,7 +1238,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1237,6 +1248,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1273,15 +1292,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1297,11 +1308,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1489,7 +1500,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1499,15 +1510,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1664,7 +1675,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1672,15 +1683,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1696,7 +1707,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1764,15 +1775,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2153,7 +2164,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/mr.po b/po/mr.po
index c14f11569..5ccab31bc 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -98,19 +98,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -209,26 +205,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -237,15 +229,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -259,15 +247,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -287,11 +275,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -310,7 +298,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -320,6 +308,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -373,7 +368,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -458,19 +453,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -484,7 +479,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -585,13 +580,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -607,10 +610,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -688,7 +687,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -766,7 +765,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -815,13 +814,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -859,11 +858,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -904,7 +903,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -934,19 +933,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -967,7 +966,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1015,7 +1014,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1028,7 +1027,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1036,7 +1035,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1044,6 +1051,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1112,7 +1123,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1229,7 +1240,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1239,6 +1250,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1275,15 +1294,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1299,11 +1310,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1491,7 +1502,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1501,15 +1512,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1666,7 +1677,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1674,15 +1685,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1698,7 +1709,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1766,15 +1777,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2155,7 +2166,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/nl.po b/po/nl.po
index 1996b764b..c75c601ab 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr "%s (ignored)\n"
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -103,19 +103,15 @@ msgstr "%s: --enable optie kan slechts een keer opgegeven worden\n"
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr "%s: --enable: '%s' is geen bekende bewerking\n"
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -225,26 +221,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr "%s: lege --expand optie"
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -253,15 +245,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -275,15 +263,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -303,11 +291,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -329,7 +317,7 @@ msgstr "%s: ontbrekend grootte veld in '%s' optie"
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: nieuwe partitie grootte is nul of negatief"
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -339,6 +327,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr "%s: In de gast image werden geen besturingssystemen gevonden\n"
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -412,7 +407,7 @@ msgstr ""
 "gedetailleerde hulp\n"
 "lees je de man pagina virt-resize(1).\n"
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -506,19 +501,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -532,7 +527,7 @@ msgstr "%s: je kunt de -a en -d opties niet tegelijkertijd opgeven\n"
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr "%s: je kunt geen leeg argument doorgeven met --enable\n"
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -639,6 +634,10 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Gecomprimeerde output formaat"
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
@@ -647,7 +646,11 @@ msgstr ""
 "Kopieer naar doel en maakt het sparse ...\n"
 "%!"
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -665,10 +668,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -746,7 +745,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -824,7 +823,7 @@ msgstr "Dump POD voor opties (intern)"
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -879,7 +878,7 @@ msgstr "Expandeer logische volume"
 msgid "Expand partition"
 msgstr "Expandeer partitie"
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
@@ -887,7 +886,7 @@ msgstr ""
 "%s wordt geëxpandeerd met de '%s' methode ...\n"
 "%!"
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -936,11 +935,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -985,7 +984,7 @@ msgstr "Formaat van output schijf"
 msgid "Format of output disk (default: same as input)"
 msgstr "Formaat van output schijf (standaard: hetzelfde als input)"
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1015,19 +1014,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -1048,7 +1047,7 @@ msgstr "Toon ondersteunde bewerkingen"
 msgid "Make output machine readable"
 msgstr "Maak output leesbaar voor machines"
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1102,7 +1101,7 @@ msgstr ""
 "worden nieuwe willekeurige UUID's aangemaakt en toegekend aan die PV's en "
 "VG's."
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1118,7 +1117,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1126,7 +1125,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1134,6 +1141,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Voer een test run uit"
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1204,7 +1215,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr "Verwijder veel log bestanden van de gast"
 
@@ -1338,7 +1349,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr "Verwijder at-jobs en cron-jobs van gebruiker"
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1351,6 +1362,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Verander grootte van partitie"
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr "Voer willekeurige scrips voor de gast uit"
@@ -1389,15 +1408,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1413,11 +1424,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1605,7 +1616,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1615,15 +1626,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1843,7 +1854,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1851,15 +1862,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1879,7 +1890,7 @@ msgstr ""
 "\n"
 "Zie L</RANDOM SEED> hieronder."
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1956,15 +1967,15 @@ msgstr "empty --shrink optie"
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr "extern commando '%s' werd afgeschoten door signaal %d"
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr "extern commando '%s' werd gestopt door signaal %d"
 
@@ -2354,7 +2365,7 @@ msgstr "virt-sysprep: script: afgeschoten door signaal (%d)\n"
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/or.po b/po/or.po
index 4f5406f96..08d73f293 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/pa.po b/po/pa.po
index c3ecdde8f..7700d7ec0 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/pl.po b/po/pl.po
index 3f4a9bfba..aacf20f98 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -100,19 +100,15 @@ msgstr "%s: opcja --enable może zostać podana tylko raz\n"
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -212,26 +208,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -240,15 +232,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -262,15 +250,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -290,11 +278,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -313,7 +301,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: nowy rozmiar partycji wynosi zero lub jest ujemny"
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -323,6 +311,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -376,7 +371,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -461,19 +456,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -487,7 +482,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -588,13 +583,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -612,10 +615,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -693,7 +692,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -771,7 +770,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -824,13 +823,13 @@ msgstr "Rozszerza wolumin logiczny"
 msgid "Expand partition"
 msgstr "Rozszerza partycję"
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -870,11 +869,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -915,7 +914,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -945,19 +944,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -978,7 +977,7 @@ msgstr "Wyświetla listę obsługiwanych działań"
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1026,7 +1025,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1039,7 +1038,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1047,7 +1046,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1055,6 +1062,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1125,7 +1136,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1242,7 +1253,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1252,6 +1263,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Zmienia rozmiar partycji"
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1288,15 +1307,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1312,11 +1323,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1504,7 +1515,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1514,15 +1525,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1679,7 +1690,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1687,15 +1698,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1711,7 +1722,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1781,15 +1792,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2170,7 +2181,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/ta.po b/po/ta.po
index dac237883..454152473 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -96,19 +96,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -207,26 +203,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -235,15 +227,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -257,15 +245,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -285,11 +273,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -308,7 +296,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -318,6 +306,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -371,7 +366,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -456,19 +451,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -482,7 +477,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -583,13 +578,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -605,10 +608,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -686,7 +685,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -764,7 +763,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -813,13 +812,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -857,11 +856,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -902,7 +901,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -932,19 +931,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -965,7 +964,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1013,7 +1012,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1026,7 +1025,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1034,7 +1033,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1042,6 +1049,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1110,7 +1121,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1227,7 +1238,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1237,6 +1248,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1273,15 +1292,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1297,11 +1308,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1489,7 +1500,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1499,15 +1510,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1664,7 +1675,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1672,15 +1683,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1696,7 +1707,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1764,15 +1775,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2153,7 +2164,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/te.po b/po/te.po
index 68acc1bff..84659149e 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,7 +69,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -97,19 +97,15 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -208,26 +204,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr ""
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -236,15 +228,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -258,15 +246,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -286,11 +274,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -309,7 +297,7 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -319,6 +307,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -372,7 +367,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -457,19 +452,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -483,7 +478,7 @@ msgstr ""
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr ""
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -584,13 +579,21 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -606,10 +609,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -765,7 +764,7 @@ msgstr ""
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -814,13 +813,13 @@ msgstr ""
 msgid "Expand partition"
 msgstr ""
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
 msgstr ""
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -858,11 +857,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -903,7 +902,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -933,19 +932,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -966,7 +965,7 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1014,7 +1013,7 @@ msgid ""
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1027,7 +1026,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1035,7 +1034,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1043,6 +1050,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1111,7 +1122,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1228,7 +1239,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1238,6 +1249,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
@@ -1274,15 +1293,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1298,11 +1309,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1490,7 +1501,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1500,15 +1511,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1665,7 +1676,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1673,15 +1684,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1697,7 +1708,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1765,15 +1776,15 @@ msgstr ""
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2154,7 +2165,7 @@ msgstr ""
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"
diff --git a/po/uk.po b/po/uk.po
index 4f261c6b8..ee8385e8b 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: 2013-12-12 16:17+0000\n"
+"POT-Creation-Date: 2013-12-14 16:44+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr "%s (проігноровано)\n"
 
-#: ../builder/builder.ml:720 ../builder/builder.ml:426
+#: ../builder/builder.ml:868 ../builder/builder.ml:572
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:516
+#: ../builder/builder.ml:662
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
@@ -102,19 +102,15 @@ msgstr "%s: параметр --enable можна вказувати лише о
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr "%s: --enable: «%s» не є відомою програмі дією\n"
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:689
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/builder.ml:289
-msgid "%s: --size is too small for this disk image, minimum size is %s\n"
-msgstr ""
-
 #: ../builder/cmdline.ml:183
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
-#: ../mllib/common_utils.ml:193
+#: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
 "complete output."
@@ -226,26 +222,22 @@ msgstr ""
 msgid "%s: empty --expand option"
 msgstr "%s: порожній аргумент параметра --expand"
 
-#: ../mllib/common_utils.ml:189
+#: ../mllib/common_utils.ml:192
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:602
+#: ../builder/builder.ml:748
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: ../builder/builder.ml:902
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:757
+#: ../builder/builder.ml:905
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:321
-msgid "%s: error: could not create output file '%s'\n"
-msgstr ""
-
 #: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
@@ -254,15 +246,11 @@ msgstr ""
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:387
-msgid "%s: error: virt-resize failed\n"
-msgstr ""
-
-#: ../builder/builder.ml:775
+#: ../builder/builder.ml:923
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:763
+#: ../builder/builder.ml:911
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -276,15 +264,15 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:772
+#: ../builder/builder.ml:920
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../builder/builder.ml:769
+#: ../builder/builder.ml:917
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../builder/builder.ml:766
+#: ../builder/builder.ml:914
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -304,11 +292,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:908
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:486
+#: ../builder/builder.ml:632
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -331,7 +319,7 @@ msgstr "%s: не вказано аргумент розміру у параме
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: розмір нового розділу є нульовим або від’ємним"
 
-#: ../builder/builder.ml:430
+#: ../builder/builder.ml:576
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -341,6 +329,13 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr "%s: у образі гостьової системи не знайдено операційних систем\n"
 
+#: ../builder/builder.ml:396
+msgid ""
+"%s: no plan could be found for making a disk image with\n"
+"the required size, format etc. This is a bug in libguestfs!\n"
+"Please file a bug, giving the command line arguments you used.\n"
+msgstr ""
+
 #: ../resize/resize.ml:562
 msgid "%s: partition already deleted, you cannot use it in '%s' option"
 msgstr ""
@@ -414,7 +409,7 @@ msgstr ""
 "Коротке резюме параметрів наведено нижче. Щоб отримати докладну довідку,\n"
 "будь ласка, ознайомтеся зі сторінкою підручника (man) virt-resize(1)\n"
 
-#: ../builder/builder.ml:547
+#: ../builder/builder.ml:693
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
@@ -507,19 +502,19 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:444
+#: ../builder/builder.ml:590
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:436
+#: ../builder/builder.ml:582
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:465
+#: ../builder/builder.ml:611
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
@@ -533,7 +528,7 @@ msgstr "%s: не можна передавати одночасно параме
 msgid "%s: you cannot pass an empty argument to --enable\n"
 msgstr "%s: параметру --enable не можна передавати порожніх аргументів\n"
 
-#: ../builder/builder.ml:265
+#: ../builder/builder.ml:278
 msgid "%s: you cannot use --size option with block devices\n"
 msgstr ""
 
@@ -641,6 +636,10 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Стиснений формат виведення даних"
 
+#: ../builder/builder.ml:526
+msgid "Converting %s to %s"
+msgstr ""
+
 #: ../sparsify/sparsify.ml:453
 msgid ""
 "Copy to destination and make sparse ...\n"
@@ -649,7 +648,11 @@ msgstr ""
 "Скопіювати призначення і виконати розрідження…\n"
 "%!"
 
-#: ../resize/resize.ml:1082
+#: ../builder/builder.ml:454
+msgid "Copying"
+msgstr ""
+
+#: ../resize/resize.ml:1079
 msgid ""
 "Copying %s ...\n"
 "%!"
@@ -667,10 +670,6 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:312
-msgid "Creating disk image: %s"
-msgstr ""
-
 #: ../sysprep/sysprep_operation_hostname.ml:45
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
@@ -748,7 +747,7 @@ msgstr ""
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:613
+#: ../builder/builder.ml:759
 msgid "Deleting: %s"
 msgstr ""
 
@@ -826,7 +825,7 @@ msgstr "Створити дамп POD для параметрів (вбудов
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:599
+#: ../builder/builder.ml:745
 msgid "Editing: %s"
 msgstr ""
 
@@ -881,7 +880,7 @@ msgstr "Розширити логічний том"
 msgid "Expand partition"
 msgstr "Розширити розділ"
 
-#: ../resize/resize.ml:1231
+#: ../resize/resize.ml:1228
 msgid ""
 "Expanding %s using the '%s' method ...\n"
 "%!"
@@ -889,7 +888,7 @@ msgstr ""
 "Розширення %s за допомогою методу «%s»…\n"
 "%!"
 
-#: ../resize/resize.ml:1214
+#: ../resize/resize.ml:1211
 msgid ""
 "Expanding %s%s using the '%s' method ...\n"
 "%!"
@@ -938,11 +937,11 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:709
+#: ../builder/builder.ml:857
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1138
+#: ../resize/resize.ml:1135
 msgid ""
 "Fixing first NTFS partition boot record ...\n"
 "%!"
@@ -989,7 +988,7 @@ msgstr ""
 "Формат диска результатів (типове значення: той самий, що і у початкового "
 "диска)"
 
-#: ../builder/builder.ml:699
+#: ../builder/builder.ml:847
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1019,19 +1018,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:636
+#: ../builder/builder.ml:782
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:639
+#: ../builder/builder.ml:785
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:632
+#: ../builder/builder.ml:778
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:554
+#: ../builder/builder.ml:700
 msgid "Installing packages: %s"
 msgstr ""
 
@@ -1052,7 +1051,7 @@ msgstr "Показати список підтримуваних команд"
 msgid "Make output machine readable"
 msgstr "Зробити машину виведення даних придатною для читання даних"
 
-#: ../builder/builder.ml:563
+#: ../builder/builder.ml:709
 msgid "Making directory: %s"
 msgstr ""
 
@@ -1105,7 +1104,7 @@ msgstr ""
 "(ГТ) LVM2\n"
 "для ФТ і ГТ буде створено і призначено випадкові UUID."
 
-#: ../sysprep/sysprep_operation_logfiles.ml:110
+#: ../sysprep/sysprep_operation_logfiles.ml:117
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1121,7 +1120,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:393
+#: ../builder/builder.ml:539
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1129,7 +1128,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:696
+#: ../builder/builder.ml:844
+msgid "Output format: %s"
+msgstr ""
+
+#: ../builder/builder.ml:843
+msgid "Output size: %s"
+msgstr ""
+
+#: ../builder/builder.ml:842
 msgid "Output: %s"
 msgstr ""
 
@@ -1137,6 +1144,10 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Виконати тестовий запуск"
 
+#: ../builder/builder.ml:391
+msgid "Planning how to build this image"
+msgstr ""
+
 #: ../builder/cmdline.ml:251
 msgid "Print info about template cache"
 msgstr ""
@@ -1209,7 +1220,7 @@ msgid ""
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:108
+#: ../sysprep/sysprep_operation_logfiles.ml:115
 msgid "Remove many log files from the guest"
 msgstr "Вилучити з гостьової системи багато файлів журналів"
 
@@ -1342,7 +1353,7 @@ msgstr ""
 msgid "Remove user at-jobs and cron-jobs"
 msgstr "Вилучити завдання at та cron користувачів"
 
-#: ../resize/resize.ml:1259
+#: ../resize/resize.ml:1256
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
@@ -1355,6 +1366,14 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Змінити розміри розділу"
 
+#: ../builder/builder.ml:481
+msgid "Resizing (using virt-resize) to expand the disk to %s"
+msgstr ""
+
+#: ../builder/builder.ml:513
+msgid "Resizing container (but not filesystems) to expand the disk to %s"
+msgstr ""
+
 #: ../sysprep/sysprep_operation_script.ml:111
 msgid "Run arbitrary scripts against the guest"
 msgstr "Запустити довільні скрипти дій над гостьовою системою"
@@ -1393,15 +1412,7 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:361
-msgid "Running virt-resize to expand the disk"
-msgstr ""
-
-#: ../builder/builder.ml:363
-msgid "Running virt-resize to expand the disk to %s"
-msgstr ""
-
-#: ../builder/builder.ml:653 ../builder/builder.ml:649
+#: ../builder/builder.ml:799 ../builder/builder.ml:795
 msgid "Running: %s"
 msgstr ""
 
@@ -1417,11 +1428,11 @@ msgstr ""
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:664
+#: ../builder/builder.ml:810
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:766
 msgid "Scrubbing: %s"
 msgstr ""
 
@@ -1609,7 +1620,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:434
+#: ../builder/builder.ml:580
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1619,15 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:460
+#: ../builder/builder.ml:606
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:457
+#: ../builder/builder.ml:603
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:588
 msgid "Setting the hostname: %s"
 msgstr ""
 
@@ -1842,7 +1853,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:697
+#: ../builder/builder.ml:845
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1850,15 +1861,15 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:353 ../builder/builder.ml:343
-msgid "Uncompressing: %s"
+#: ../builder/builder.ml:469
+msgid "Uncompressing"
 msgstr ""
 
 #: ../builder/cmdline.ml:262
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:577
+#: ../builder/builder.ml:723
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1879,7 +1890,7 @@ msgstr ""
 "\n"
 "Див. L</RANDOM SEED> нижче."
 
-#: ../builder/builder.ml:570
+#: ../builder/builder.ml:716
 msgid "Writing: %s"
 msgstr ""
 
@@ -1957,15 +1968,15 @@ msgstr "порожній параметр --shrink"
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../mllib/common_utils.ml:340
+#: ../mllib/common_utils.ml:343
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:342
+#: ../mllib/common_utils.ml:345
 msgid "external command '%s' killed by signal %d"
 msgstr "роботу зовнішньої програми «%s» перервано з сигналом %d"
 
-#: ../mllib/common_utils.ml:344
+#: ../mllib/common_utils.ml:347
 msgid "external command '%s' stopped by signal %d"
 msgstr "роботу зовнішньої програми «%s» зупинено з сигналом %d"
 
@@ -2362,7 +2373,7 @@ msgstr "virt-sysprep: скрипт: перервано сигналом (%d)\n"
 msgid "warning: cannot set random UUID on filesystem %s type %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1135
+#: ../resize/resize.ml:1132
 msgid ""
 "warning: first partition is NTFS but does not contain NTFS boot loader "
 "magic\n"