[Pkg-libvirt-commits] [libguestfs] 05/165: Version 1.27.7.

Hilko Bengen bengen at moszumanska.debian.org
Sat Aug 30 08:24:00 UTC 2014


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 8df792d4a76eb188fcbc68b38c8bc1e757a6f6ff
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Apr 23 19:50:37 2014 +0100

    Version 1.27.7.
---
 BUGS                        |  7 +---
 configure.ac                |  2 +-
 po-docs/libguestfs-docs.pot |  4 +-
 po/en_GB.po                 | 94 ++++++++++++++++++++++----------------------
 po/es.po                    | 94 ++++++++++++++++++++++----------------------
 po/gu.po                    | 94 ++++++++++++++++++++++----------------------
 po/hi.po                    | 94 ++++++++++++++++++++++----------------------
 po/kn.po                    | 94 ++++++++++++++++++++++----------------------
 po/libguestfs.pot           | 96 ++++++++++++++++++++++-----------------------
 po/ml.po                    | 94 ++++++++++++++++++++++----------------------
 po/mr.po                    | 94 ++++++++++++++++++++++----------------------
 po/nl.po                    | 94 ++++++++++++++++++++++----------------------
 po/or.po                    | 94 ++++++++++++++++++++++----------------------
 po/pa.po                    | 94 ++++++++++++++++++++++----------------------
 po/pl.po                    | 94 ++++++++++++++++++++++----------------------
 po/ta.po                    | 94 ++++++++++++++++++++++----------------------
 po/te.po                    | 94 ++++++++++++++++++++++----------------------
 po/uk.po                    | 94 ++++++++++++++++++++++----------------------
 18 files changed, 711 insertions(+), 714 deletions(-)

diff --git a/BUGS b/BUGS
index a158648..f9134d6 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-04-22
+Last updated: 2014-04-23
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -281,9 +281,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1076478 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1076478
   FTBFS: libguestfs-1.22.6-15.el7
 
-1077817 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1077817
-  virt-builder error: "syntax error at line 3: syntax error"
-
 1079182 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1079182
   virt-df cannot report used disk space of windows guest when updated to 6.5
 
@@ -326,7 +323,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1025269 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1025269
   libguestfs tests hang in libguestfs-1.20.11/tests/guests/guest-aux/make-fedora-img.pl
 
-(102 bugs)
+(101 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
diff --git a/configure.ac b/configure.ac
index bb1a361..b80644c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [27])
-m4_define([libguestfs_release], [6])
+m4_define([libguestfs_release], [7])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 6e21eec..b091043 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.27.6\n"
+"Project-Id-Version: libguestfs 1.27.7\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-04-22 13:38+0200\n"
+"POT-Creation-Date: 2014-04-23 19:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 93f8bbb..f224d97 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 2aa1063..d307046 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/fedora/language/"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -202,25 +202,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -255,16 +255,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -274,22 +274,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -301,33 +301,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -345,7 +345,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -372,7 +372,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -382,14 +382,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -495,7 +495,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -543,15 +543,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -677,7 +677,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -687,7 +687,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -843,7 +843,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -890,7 +890,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -974,7 +974,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1015,7 +1015,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1144,7 +1144,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1152,15 +1152,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1394,11 +1394,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1693,7 +1693,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1745,7 +1745,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1809,11 +1809,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1893,7 +1893,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index aa9252f..622d0ad 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/fedora/language/"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -201,25 +201,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -254,16 +254,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -273,22 +273,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -300,33 +300,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -381,14 +381,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -542,15 +542,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1151,15 +1151,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1393,11 +1393,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1808,11 +1808,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 37d7a4c..01dee56 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/fedora/language/"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -201,25 +201,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -254,16 +254,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -273,22 +273,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -300,33 +300,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -381,14 +381,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -542,15 +542,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1151,15 +1151,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1393,11 +1393,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1808,11 +1808,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index c6765b4..1283286 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index c3bcf15..2761110 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.27.6\n"
+"Project-Id-Version: libguestfs 1.27.7\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -72,7 +72,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -199,25 +199,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -233,7 +233,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -252,16 +252,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -271,22 +271,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -298,33 +298,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -342,7 +342,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -379,14 +379,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -492,7 +492,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -540,15 +540,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -674,7 +674,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -684,7 +684,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -840,7 +840,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -887,7 +887,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -971,7 +971,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1012,7 +1012,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1141,7 +1141,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1149,15 +1149,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1180,7 +1180,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1391,11 +1391,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1690,7 +1690,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1724,7 +1724,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1742,7 +1742,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1806,11 +1806,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1890,7 +1890,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index cdb232b..57b2b5a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/fedora/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 8672dee..abcbb38 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -201,25 +201,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -254,16 +254,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -273,22 +273,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -300,33 +300,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -381,14 +381,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -542,15 +542,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1151,15 +1151,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1393,11 +1393,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1808,11 +1808,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 5275268..a080c38 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -79,7 +79,7 @@ msgstr "%s (ignored)\n"
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -217,25 +217,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -251,7 +251,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -270,16 +270,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -289,22 +289,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -316,33 +316,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr "%s: bestand is te klein om een schijf image te zijn (%Ld bytes)"
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -360,7 +360,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr "%s: nieuwe partitie grootte is nul of negatief"
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -400,14 +400,14 @@ 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:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -533,7 +533,7 @@ msgstr "%s: deze partitie overlapt de vorige"
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -583,15 +583,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -721,7 +721,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Gecomprimeerde output formaat"
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -733,7 +733,7 @@ msgstr ""
 "Kopieer naar doel en maakt het sparse ...\n"
 "%!"
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -891,7 +891,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -938,7 +938,7 @@ msgstr "Zet traceren van libguestfs aanroepen aan"
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -1039,7 +1039,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1084,7 +1084,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:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1222,7 +1222,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1230,15 +1230,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Voer een test run uit"
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1494,11 +1494,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Verander grootte van partitie"
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1841,7 +1841,7 @@ msgstr ""
 "De systeembrede procesaccounting zal opgeslagen worden in de pacct\n"
 "logbestandenfiles als procesaccounting aangezet is."
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1884,7 +1884,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1975,11 +1975,11 @@ msgstr "uitlijning kan niet < 1 zijn"
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -2059,7 +2059,7 @@ msgstr "lv"
 msgid "never|always|auto"
 msgstr "nooit|altijd|auto"
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index 1779c0b..e099ceb 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 89962c9..0573fab 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/fedora/"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -201,25 +201,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -254,16 +254,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -273,22 +273,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -300,33 +300,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -381,14 +381,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -494,7 +494,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -542,15 +542,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -676,7 +676,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -686,7 +686,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1014,7 +1014,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1151,15 +1151,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1393,11 +1393,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1744,7 +1744,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1808,11 +1808,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1892,7 +1892,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 3aaa0d8..12a8823 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/fedora/language/"
@@ -77,7 +77,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -205,25 +205,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -258,16 +258,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -277,22 +277,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -304,33 +304,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -348,7 +348,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr "%s: nowy rozmiar partycji wynosi zero lub jest ujemny"
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -385,14 +385,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -498,7 +498,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -546,15 +546,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -690,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -848,7 +848,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -895,7 +895,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -983,7 +983,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1024,7 +1024,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1153,7 +1153,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1161,15 +1161,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1192,7 +1192,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1405,11 +1405,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Zmienia rozmiar partycji"
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1704,7 +1704,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1738,7 +1738,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1756,7 +1756,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1822,11 +1822,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1906,7 +1906,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr "nigdy|zawsze|automatycznie"
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 95092bd..3cacc7e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/fedora/language/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 334e91e..afcfe73 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -73,7 +73,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr ""
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -253,16 +253,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
@@ -272,22 +272,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgstr ""
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr ""
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -380,14 +380,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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 ""
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "%s: trying to read %s\n"
 msgstr ""
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -541,15 +541,15 @@ msgstr ""
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr ""
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr ""
 
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr ""
 
@@ -1150,15 +1150,15 @@ msgstr ""
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr ""
 
@@ -1392,11 +1392,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1691,7 +1691,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1725,7 +1725,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1743,7 +1743,7 @@ msgstr ""
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr ""
 
@@ -1807,11 +1807,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr ""
 
@@ -1891,7 +1891,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index f41bb55..c1a712d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-04-22 13:38+0100\n"
+"POT-Creation-Date: 2014-04-23 19:49+0100\n"
 "PO-Revision-Date: 2014-03-26 16:49+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/fedora/"
@@ -100,7 +100,7 @@ msgstr "%s (проігноровано)\n"
 msgid "%s: %s\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:337 ../builder/builder.ml:623
+#: ../customize/customize_run.ml:337 ../builder/builder.ml:611
 msgid "%s: %s (ignored)\n"
 msgstr "%s: %s (прогіноровано)\n"
 
@@ -269,7 +269,7 @@ msgstr ""
 "матеріал\n"
 "можна знайти на сторінці підручника (man) програми virt-builder(1).\n"
 
-#: ../builder/builder.ml:212
+#: ../builder/builder.ml:200
 msgid ""
 "%s: cannot find os-version '%s' with architecture '%s'.\n"
 "Use --list to list available guest types.\n"
@@ -278,22 +278,22 @@ msgstr ""
 "Скористайтеся параметром --list, щоб переглянути список доступних типів "
 "операційних систем.\n"
 
-#: ../builder/builder.ml:295
+#: ../builder/builder.ml:283
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 "%s: виведення даних на символьний пристрій або до /dev/null неможливе\n"
 
-#: ../builder/downloader.ml:99
+#: ../builder/downloader.ml:95
 msgid "%s: cp (download) command failed copying '%s'\n"
 msgstr ""
 "%s: команда копіювання (cp) або отримання даних не змогла виконати "
 "копіювання «%s»\n"
 
-#: ../builder/downloader.ml:140
+#: ../builder/downloader.ml:136
 msgid "%s: curl (download) command failed downloading '%s'\n"
 msgstr "%s: команді для отримання даних (curl) не вдалося отримати «%s»\n"
 
-#: ../builder/builder.ml:101
+#: ../builder/builder.ml:100
 msgid "%s: curl is not installed (or does not work)\n"
 msgstr "%s: curl не встановлено (або програма є непрацездатною)\n"
 
@@ -309,7 +309,7 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:130
+#: ../builder/builder.ml:120
 msgid ""
 "%s: disabling the cache\n"
 "%!"
@@ -330,16 +330,16 @@ msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:52 ../resize/resize.ml:1302
-#: ../builder/builder.ml:704
+#: ../builder/builder.ml:692
 msgid "%s: error: %s: %s\n"
 msgstr "%s: помилка: %s: %s\n"
 
 #: ../sparsify/sparsify.ml:55 ../resize/resize.ml:1305
-#: ../builder/builder.ml:707
+#: ../builder/builder.ml:695
 msgid "%s: error: %s: %s: %s\n"
 msgstr "%s: помилка: %s: %s: %s\n"
 
-#: ../builder/builder.ml:76
+#: ../builder/builder.ml:75
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 "%s: помилка: не вдалося знайти каталог кешу. Чи встановлено значення змінної "
@@ -351,22 +351,22 @@ msgid ""
 "user '%s' twice.\n"
 msgstr ""
 
-#: ../builder/builder.ml:188
+#: ../builder/builder.ml:176
 msgid "%s: error: no cache directory\n"
 msgstr "%s: помилка: немає каталогу кешування\n"
 
 #. ../customize/customize_main.ml:261
-#. ../builder/builder.ml:725
+#. ../builder/builder.ml:713
 #: ../sparsify/sparsify.ml:74 ../resize/resize.ml:1324
 msgid "%s: exception: %s\n"
 msgstr "%s: виключення: %s\n"
 
-#: ../builder/downloader.ml:126
+#: ../builder/downloader.ml:122
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr "%s: не вдалося отримати %s: код стану HTTP %s\n"
 
 #: ../sparsify/sparsify.ml:62 ../resize/resize.ml:1312
-#: ../builder/builder.ml:713
+#: ../builder/builder.ml:701
 msgid "%s: failure: %s\n"
 msgstr "%s: помилка: %s\n"
 
@@ -378,7 +378,7 @@ msgstr "%s: помилка під час обробки файла: %s: %s\n"
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr "%s: файл є надто малим, щоб бути образом диска (%Ld байтів)"
 
-#: ../builder/builder.ml:91
+#: ../builder/builder.ml:90
 msgid ""
 "%s: gpg is not installed (or does not work)\n"
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
@@ -387,7 +387,7 @@ msgstr ""
 "Вам слід встановити gpg, скористатися іншим значенням аргументу --gpg або "
 "скористатися параметром --no-check-signature.\n"
 
-#: ../builder/builder.ml:322
+#: ../builder/builder.ml:310
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
@@ -396,20 +396,20 @@ msgstr ""
 "образу. Потрібний розмір = %s, мінімальний розмір = %s\n"
 
 #. ../customize/customize_main.ml:258
-#. ../builder/builder.ml:722
+#. ../builder/builder.ml:710
 #: ../sparsify/sparsify.ml:71 ../resize/resize.ml:1321
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr "%s: внутрішня помилка: сталося виключення Not_found\n"
 
 #. ../customize/customize_main.ml:254
-#. ../builder/builder.ml:719
+#. ../builder/builder.ml:707
 #: ../sparsify/sparsify.ml:68 ../resize/resize.ml:1318
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr "%s: внутрішня помилка: помилка твердження у %s, рядок %d, символ %d\n"
 
 #. ../customize/customize_main.ml:251
 #. ../builder/sources.ml:135
-#. ../builder/builder.ml:716
+#. ../builder/builder.ml:704
 #: ../sparsify/sparsify.ml:65 ../resize/resize.ml:1315
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr "%s: внутрішня помилка: некоректний аргумент: %s\n"
@@ -428,7 +428,7 @@ msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
 #: ../sparsify/sparsify.ml:59 ../resize/resize.ml:1309
-#: ../builder/builder.ml:710
+#: ../builder/builder.ml:698
 msgid "%s: libguestfs error: %s\n"
 msgstr "%s: помилка libguestfs: %s\n"
 
@@ -459,7 +459,7 @@ msgstr "%s: розмір нового розділу є нульовим або
 msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
 msgstr "%s: запис «%s» у %s не містить частини «uri», пропускаємо його\n"
 
-#: ../builder/builder.ml:627
+#: ../builder/builder.ml:615
 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"
@@ -473,7 +473,7 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr "%s: у образі гостьової системи не знайдено операційних систем\n"
 
-#: ../builder/builder.ml:447
+#: ../builder/builder.ml:435
 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"
@@ -484,7 +484,7 @@ msgstr ""
 "Будь ласка, повідомте про неї, вказавши використані вами параметри\n"
 "командного рядка.\n"
 
-#: ../builder/builder.ml:327
+#: ../builder/builder.ml:315
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -623,7 +623,7 @@ msgstr "%s: цей розділ перекривається з попередн
 msgid "%s: trying to read %s\n"
 msgstr "%s: намагаємося прочитати %s\n"
 
-#: ../builder/downloader.ml:114
+#: ../builder/downloader.ml:110
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
 "messages\n"
@@ -687,15 +687,15 @@ msgstr ""
 "%s: virt-builder: забагато параметрів, мало бути вказано лише версію "
 "операційної системи.\n"
 
-#: ../builder/builder.ml:108
+#: ../builder/builder.ml:107
 msgid "%s: virt-resize is not installed (or does not work)\n"
 msgstr "%s: virt-resize не встановлено (або програма є непрацездатною)\n"
 
-#: ../builder/builder.ml:128
+#: ../builder/builder.ml:118
 msgid "%s: warning: cache %s: %s\n"
 msgstr "%s: попередження: кеш %s: %s\n"
 
-#: ../builder/builder.ml:95
+#: ../builder/builder.ml:94
 msgid "%s: warning: gpg program is not available\n"
 msgstr "%s: попередження: немає доступу до програми gpg\n"
 
@@ -825,7 +825,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Стиснений формат виведення даних"
 
-#: ../builder/builder.ml:575
+#: ../builder/builder.ml:563
 msgid "Converting %s to %s"
 msgstr "Перетворюємо %s на %s"
 
@@ -837,7 +837,7 @@ msgstr ""
 "Скопіювати призначення і виконати розрідження…\n"
 "%!"
 
-#: ../builder/builder.ml:506
+#: ../builder/builder.ml:494
 msgid "Copying"
 msgstr "Копіювання"
 
@@ -1009,7 +1009,7 @@ msgstr "Отримати усі шаблони до кешу"
 msgid "Download size:"
 msgstr "Розмір отриманих даних:"
 
-#: ../builder/builder.ml:241 ../builder/builder.ml:195
+#: ../builder/builder.ml:229 ../builder/builder.ml:183
 msgid "Downloading: %s"
 msgstr "Отримання: %s"
 
@@ -1056,7 +1056,7 @@ msgstr "Увімкнути трасування викликів libguestfs"
 msgid "Enable/disable specific operations"
 msgstr "Увімкнути або вимкнути певні дії"
 
-#: ../builder/downloader.ml:80
+#: ../builder/downloader.ml:76
 msgid "Error parsing URI '%s'. Look for error messages printed above.\n"
 msgstr ""
 "Помилка під час обробки адреси «%s». Ознайомтеся з виведеними вище "
@@ -1159,7 +1159,7 @@ msgstr "Відбиток чинного ключа підпису"
 msgid "Fingerprint: %s\n"
 msgstr "Відбиток: %s\n"
 
-#: ../customize/customize_main.ml:236 ../builder/builder.ml:672
+#: ../customize/customize_main.ml:236 ../builder/builder.ml:660
 msgid "Finishing off"
 msgstr "Остаточне коригування"
 
@@ -1206,7 +1206,7 @@ msgstr ""
 "Формат диска результатів (типове значення: той самий, що і у початкового "
 "диска)"
 
-#: ../builder/builder.ml:662
+#: ../builder/builder.ml:650
 msgid "Free space: %s (%Ld%%)"
 msgstr "Вільне місце: %s (%Ld%%)"
 
@@ -1351,7 +1351,7 @@ msgstr ""
 "підтримку,\n"
 "буде створено нові випадкові UUID, які буде пов’язано з файловими системами."
 
-#: ../builder/builder.ml:588
+#: ../builder/builder.ml:576
 msgid "Opening the new disk"
 msgstr "Відкриваємо новий диск"
 
@@ -1359,15 +1359,15 @@ msgstr "Відкриваємо новий диск"
 msgid "Output format (default: raw)"
 msgstr "Формат виведених даних (типово, raw)"
 
-#: ../builder/builder.ml:659
+#: ../builder/builder.ml:647
 msgid "Output format: %s"
 msgstr "Формат результату: %s"
 
-#: ../builder/builder.ml:658
+#: ../builder/builder.ml:646
 msgid "Output size: %s"
 msgstr "Розмір результату: %s"
 
-#: ../builder/builder.ml:657
+#: ../builder/builder.ml:645
 msgid "Output: %s"
 msgstr "Виведення: %s"
 
@@ -1390,7 +1390,7 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Виконати тестовий запуск"
 
-#: ../builder/builder.ml:442
+#: ../builder/builder.ml:430
 msgid "Planning how to build this image"
 msgstr "Планування побудови цього образу"
 
@@ -1626,11 +1626,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Змінити розміри розділу"
 
-#: ../builder/builder.ml:533
+#: ../builder/builder.ml:521
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr "Змінюємо розміри (за допомогою virt-resize) для розширення диска до %s"
 
-#: ../builder/builder.ml:562
+#: ../builder/builder.ml:550
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 "Зміна розмірів контейнера (але не файлової системи) для розширення диска до "
@@ -1997,7 +1997,7 @@ msgstr ""
 "Дані обліку процесів системи будуть зберігатися у файлах журналу\n"
 "pacct, якщо увімкнено облік процесів."
 
-#: ../builder/builder.ml:226
+#: ../builder/builder.ml:214
 msgid "There are no notes for %s\n"
 msgstr "Немає нотаток щодо %s\n"
 
@@ -2043,7 +2043,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr "Вилучає тимчасові файли з C</tmp> і C</var/tmp>."
 
-#: ../builder/builder.ml:660
+#: ../builder/builder.ml:648
 msgid "Total usable space: %s"
 msgstr "Загальний придатний до використання об’єм: %s"
 
@@ -2063,7 +2063,7 @@ msgstr "Вимкнути розріджене копіювання"
 msgid "USER:SELECTOR"
 msgstr ""
 
-#: ../builder/builder.ml:521
+#: ../builder/builder.ml:509
 msgid "Uncompressing"
 msgstr "Розпаковуємо"
 
@@ -2135,11 +2135,11 @@ msgstr "значенням вирівнювання не може бути чи
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:171
+#: ../builder/cache.ml:58
 msgid "cache directory: %s\n"
 msgstr "Каталог кешування: %s\n"
 
-#: ../builder/builder.ml:178
+#: ../builder/cache.ml:64
 msgid "cached"
 msgstr "кешовано"
 
@@ -2225,7 +2225,7 @@ msgstr "логічний том"
 msgid "never|always|auto"
 msgstr "never|always|auto"
 
-#: ../builder/builder.ml:181
+#: ../builder/builder.ml:169
 msgid "no cache directory\n"
 msgstr "немає каталогу кешування\n"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git



More information about the Pkg-libvirt-commits mailing list