[Pkg-libvirt-commits] [libguestfs] 20/31: Version 1.29.45.

Hilko Bengen bengen at moszumanska.debian.org
Sun Nov 1 17:13:09 UTC 2015


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

bengen pushed a commit to annotated tag upstream/1.29.46
in repository libguestfs.

commit 14a8461a5c3deac5f29b354c5e02201173a39879
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jun 2 17:38:46 2015 +0100

    Version 1.29.45.
---
 BUGS                        |  99 ++++++++++++-------------
 configure.ac                |   2 +-
 po-docs/de.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/en_GB.po            | 152 ++++++++++++++++++++++++++++++++++++---
 po-docs/es.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/eu.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/fr.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/ja.po               | 152 ++++++++++++++++++++++++++++++++++++---
 po-docs/libguestfs-docs.pot | 151 +++++++++++++++++++++++++++++++++++---
 po-docs/nl.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/tg.po               | 150 +++++++++++++++++++++++++++++++++++---
 po-docs/uk.po               | 171 +++++++++++++++++++++++++++++++++++++++++---
 po-docs/zh_CN.po            | 150 +++++++++++++++++++++++++++++++++++---
 po/de.po                    |  38 ++++++----
 po/en_GB.po                 |  38 ++++++----
 po/es.po                    |  38 ++++++----
 po/eu.po                    |  38 ++++++----
 po/fr.po                    |  38 ++++++----
 po/gu.po                    |  38 ++++++----
 po/hi.po                    |  38 ++++++----
 po/ja.po                    |  38 ++++++----
 po/kn.po                    |  38 ++++++----
 po/libguestfs.pot           |  40 ++++++-----
 po/ml.po                    |  38 ++++++----
 po/mr.po                    |  38 ++++++----
 po/nl.po                    |  38 ++++++----
 po/or.po                    |  38 ++++++----
 po/pa.po                    |  38 ++++++----
 po/pl.po                    |  38 ++++++----
 po/ru.po                    |  38 ++++++----
 po/ta.po                    |  38 ++++++----
 po/te.po                    |  38 ++++++----
 po/tg.po                    |  38 ++++++----
 po/uk.po                    |  38 ++++++----
 po/zh_CN.po                 |  38 ++++++----
 po/zh_TW.po                 |  38 ++++++----
 36 files changed, 2163 insertions(+), 490 deletions(-)

diff --git a/BUGS b/BUGS
index adc2238..c42bd2a 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2015-05-26
+Last updated: 2015-06-02
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -245,9 +245,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1108171 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1108171
   RFE: virt-builder should be able to build PXE images for baremetal installation
 
-1111794 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1111794
-  virt-sparsify leaves lots of data in TMPDIR
-
 1114012 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1114012
   "yum install guestfish" on fresh Fedora 20 results in broken libguestfs
 
@@ -284,12 +281,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1150298 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150298
   ARM 32 bit on Ubuntu: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
 
-1150816 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150816
-  Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
-
-1150858 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150858
-  virt-sparsify: unknown option `--check-tmpdir=ignore'
-
 1151902 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151902
   virt-v2v:Network interface disappear after conversion of guest with interface type direct
 
@@ -395,9 +386,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1183493 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183493
   RFE: virt-rescue: add a flag to autorun the suggested mount commands and chroot, suggested with --suggest
 
-1183780 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183780
-  guestfs needs README.fixed to actually work
-
 1186800 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1186800
   virt-v2v should support gzip format ova as input
 
@@ -494,21 +482,15 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1222231 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1222231
   virt-builder --size fails on debian-7/8 because of updated sfdisk in util-linux 2.62.2
 
-1224486 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224486
-  virt-resize should preserve GPT partition UUIDs, else EFI guests become unbootable
-
-1224675 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224675
-  ppc64le: virt-sparsify fails to make a disk image sparse, the output log indicates it gets the wrong parameter in the disk create step
-
-1224676 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224676
-  ppc64le: virt-resize/virt-build/virt-sysprep/virt-customize fail to execute and return the error "Segmentation fault (core dumped)"
-
 1224795 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224795
   On Ubuntu, virt-builder --install and --update cannot use the network
 
 1224903 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224903
   'guestmount: no operating system was found on this disk' for rhel7 be guest on ppc64le host
 
+1225789 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1225789
+  Wrong video driver is installed for rhel5.11 guest after conversion to libvirt
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -575,33 +557,27 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1198344 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1198344
   [RFE] virt-builder should support download resume
 
-1211996 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1211996
-  virt-inspector gives incorrect arch (ppc64) for ppc64le guest
-
-(186 bugs)
+(179 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
 You can help by testing the fixes.
 
-1028650 POST https://bugzilla.redhat.com/show_bug.cgi?id=1028650
-  virt-* argument parser doesn't accept --arg=value (you have to use --arg value)
-
 1167623 POST https://bugzilla.redhat.com/show_bug.cgi?id=1167623
   Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v
 
 1194472 POST https://bugzilla.redhat.com/show_bug.cgi?id=1194472
   Current virt-builder index breaks version < 1.26
 
+1226794 POST https://bugzilla.redhat.com/show_bug.cgi?id=1226794
+  "Doing conversion??" still shows after cancel the conversion from virt-p2v client
+
 855059 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=855059
   RFE: virt-p2v: display more information about network devices such as topology, bonding, etc.
 
 1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
   Recommended default clock/timer settings
 
-823758 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=823758
-  p2v client should have largest number restrictions for CPU and Memory settings
-
 889082 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=889082
   [RFE] virt-v2v should check whether guest with same name exist on target first then transfer the disk
 
@@ -614,24 +590,6 @@ You can help by testing the fixes.
 1159030 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1159030
   libvirt backend does not set RBD password
 
-1165564 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165564
-  Provide Reboot/Shutdown button after virt-p2v
-
-1165569 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165569
-  Disable "cancel conversion" button after virt-p2v conversion finished
-
-1167601 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167601
-  "Conversion was successful" pop out even virt-p2v fails
-
-1167774 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167774
-  virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
-
-1167921 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167921
-  p2v: No Network Connection dialog
-
-1167922 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167922
-  p2v: No virtual console
-
 1172660 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1172660
   virt-resize --expand fails on ubuntu-14.04.img image
 
@@ -653,14 +611,26 @@ You can help by testing the fixes.
 1213691 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1213691
   Win2012R2 guest fails to boot on iscsi data domain after conversion by virt-v2v
 
-1222975 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1222975
-  virt-p2v network does not start
+1224486 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224486
+  virt-resize should preserve GPT partition UUIDs, else EFI guests become unbootable
 
-(24 bugs)
+1224675 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224675
+  ppc64le: virt-sparsify fails to make a disk image sparse, the output log indicates it gets the wrong parameter in the disk create step
+
+1224676 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224676
+  ppc64le: virt-resize/virt-build/virt-sysprep/virt-customize fail to execute and return the error "Segmentation fault (core dumped)"
+
+1225467 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1225467
+  virt-sparsify refuses to work on qcow2 files
+
+(20 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
 
+823758 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=823758
+  p2v client should have largest number restrictions for CPU and Memory settings
+
 1074005 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1074005
   java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:
 
@@ -709,6 +679,24 @@ These bugs are in the VERIFIED state.
 1164734 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164734
   The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
 
+1165564 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165564
+  Provide Reboot/Shutdown button after virt-p2v
+
+1165569 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165569
+  Disable "cancel conversion" button after virt-p2v conversion finished
+
+1167601 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167601
+  "Conversion was successful" pop out even virt-p2v fails
+
+1167774 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167774
+  virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+
+1167921 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167921
+  p2v: No Network Connection dialog
+
+1167922 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167922
+  p2v: No virtual console
+
 1168144 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168144
   warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server
 
@@ -751,6 +739,9 @@ These bugs are in the VERIFIED state.
 1212677 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1212677
   guestfish fails to add a remote image with ssh protocol
 
-(30 bugs)
+1222975 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1222975
+  virt-p2v network does not start
+
+(38 bugs)
 
 End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 1552bff..c0f355f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [29])
-m4_define([libguestfs_release], [44])
+m4_define([libguestfs_release], [45])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/de.po b/po-docs/de.po
index afda1bc..1d153fe 100644
--- a/po-docs/de.po
+++ b/po-docs/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2015-01-04 11:17-0500\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -1148,7 +1148,8 @@ msgstr "Dieses Programm gibt Folgendes zurück:"
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1331,7 +1332,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1404,7 +1405,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1743,7 +1744,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1764,7 +1765,7 @@ msgstr "AUTOREN"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12709,13 +12710,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/en_GB.po b/po-docs/en_GB.po
index 14664ee..166b95a 100644
--- a/po-docs/en_GB.po
+++ b/po-docs/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -1298,7 +1298,8 @@ msgstr "This program returns:"
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1486,7 +1487,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1559,7 +1560,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1964,7 +1965,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1985,7 +1986,7 @@ msgstr "AUTHORS"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -13919,13 +13920,148 @@ msgstr ""
 "even easier.  It's nice if you tell us on the mailing list about forks and "
 "the reasons for them."
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+#, fuzzy
+#| msgid "7. Resize LVs etc inside the guest"
+msgid "Run an agent inside the guest."
+msgstr "7. Resize LVs etc inside the guest"
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/es.po b/po-docs/es.po
index c5e9c7d..adb7226 100644
--- a/po-docs/es.po
+++ b/po-docs/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -1126,7 +1126,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1309,7 +1310,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1380,7 +1381,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1715,7 +1716,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1736,7 +1737,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12543,13 +12544,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/eu.po b/po-docs/eu.po
index d161df0..e3d8585 100644
--- a/po-docs/eu.po
+++ b/po-docs/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -1125,7 +1125,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1308,7 +1309,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1379,7 +1380,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1714,7 +1715,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1735,7 +1736,7 @@ msgstr "EGILEAK"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12521,13 +12522,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/fr.po b/po-docs/fr.po
index 391d6a3..4357d5c 100644
--- a/po-docs/fr.po
+++ b/po-docs/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -1189,7 +1189,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1372,7 +1373,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1443,7 +1444,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1798,7 +1799,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1819,7 +1820,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -13022,13 +13023,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/ja.po b/po-docs/ja.po
index 0e7a4d5..ae763a3 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -1290,7 +1290,8 @@ msgstr "このプログラムは以下を返します:"
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1479,7 +1480,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1552,7 +1553,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1926,7 +1927,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1947,7 +1948,7 @@ msgstr "著者"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -13269,13 +13270,148 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+#, fuzzy
+#| msgid "From inside the guest"
+msgid "Run an agent inside the guest."
+msgstr "仮想マシンの中から"
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 #, fuzzy
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr "Copyright (C) 2010-2012 Red Hat Inc."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 9018fb0..1e72944 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.29.44\n"
+"Project-Id-Version: libguestfs 1.29.45\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+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"
@@ -774,7 +774,7 @@ msgid "This program returns:"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:814 ../builder/virt-builder.pod:821 ../builder/virt-b [...]
+#: ../align/virt-alignment-scan.pod:356 ../align/virt-alignment-scan.pod:362 ../align/virt-alignment-scan.pod:368 ../align/virt-alignment-scan.pod:375 ../appliance/libguestfs-make-fixed-appliance.pod:22 ../appliance/libguestfs-make-fixed-appliance.pod:28 ../appliance/libguestfs-make-fixed-appliance.pod:34 ../appliance/libguestfs-make-fixed-appliance.pod:52 ../appliance/libguestfs-make-fixed-appliance.pod:73 ../builder/virt-builder.pod:814 ../builder/virt-builder.pod:821 ../builder/virt-b [...]
 msgid "*"
 msgstr ""
 
@@ -823,7 +823,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1728 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1728 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
 msgid "SEE ALSO"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1751 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1751 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1148,12 +1148,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:271 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268 ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:271 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351 ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
 msgid "AUTHORS"
 msgstr ""
 
 #. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:174 ../erlang/examples/guestfs-erlang.pod:112 ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270 ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685 ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632 ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:444 ../fuse/gu [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:174 ../erlang/examples/guestfs-erlang.pod:112 ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353 ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685 ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632 ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60 ../fish/virt-copy-out.pod:49 ../fish/virt-tar-in.pod:58 ../fish/virt-tar-out.pod:51 ../fuse/guestmount.pod:444 ../fuse/gu [...]
 msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
 msgstr ""
 
@@ -11620,13 +11620,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid "Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also "
+"L<guestfs-performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: "
+"L<https://rwmj.wordpress.com/2013/09/02/new-in-libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> "
+"instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/nl.po b/po-docs/nl.po
index 79a3dd5..2543614 100644
--- a/po-docs/nl.po
+++ b/po-docs/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -1125,7 +1125,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1308,7 +1309,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1379,7 +1380,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1714,7 +1715,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1735,7 +1736,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12527,13 +12528,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/tg.po b/po-docs/tg.po
index b3f2249..733069f 100644
--- a/po-docs/tg.po
+++ b/po-docs/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -1124,7 +1124,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1307,7 +1308,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1378,7 +1379,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1713,7 +1714,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1734,7 +1735,7 @@ msgstr "МУАЛЛИФ"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12526,13 +12527,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 50a87a1..a575079 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -1273,7 +1273,8 @@ msgstr "Ця програма повертає:"
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1458,7 +1459,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1531,7 +1532,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1892,7 +1893,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1913,7 +1914,7 @@ msgstr "АВТОРИ"
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -13394,13 +13395,167 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, fuzzy, no-wrap
+#| msgid ""
+#| "                       sect#63\n"
+#| "                       ┌──────────────────────────┬ ─ ─ ─ ─\n"
+#| "                       │         guest            │\n"
+#| "                       │    filesystem block      │\n"
+#| "  ─ ┬──────────────────┴──────┬───────────────────┴─────┬ ─ ─\n"
+#| "    │  host block             │  host block             │\n"
+#| "    │                         │                         │\n"
+#| "  ─ ┴─────────────────────────┴─────────────────────────┴ ─ ─\n"
+#| "\n"
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+"                       розділ#63\n"
+"                       ┌──────────────────────────┬ ─ ─ ─ ─\n"
+"                       │         блок             │\n"
+"                       │гостьової файлової системи│\n"
+"  ─ ┬──────────────────┴──────┬───────────────────┴─────┬ ─ ─\n"
+"    │  блок основної системи  │  блок основної системи  │\n"
+"    │                         │                         │\n"
+"  ─ ┴─────────────────────────┴─────────────────────────┴ ─ ─\n"
+"\n"
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+#, fuzzy
+#| msgid "From inside the guest"
+msgid "Run an agent inside the guest."
+msgstr "З гостьової системи"
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 #, fuzzy
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr "© Red Hat Inc., 2010–2012"
diff --git a/po-docs/zh_CN.po b/po-docs/zh_CN.po
index c457700..859bb46 100644
--- a/po-docs/zh_CN.po
+++ b/po-docs/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:01-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -1125,7 +1125,8 @@ msgstr ""
 #: ../examples/guestfs-faq.pod:875 ../examples/guestfs-faq.pod:879
 #: ../examples/guestfs-faq.pod:883 ../examples/guestfs-faq.pod:887
 #: ../examples/guestfs-faq.pod:895 ../examples/guestfs-faq.pod:900
-#: ../examples/guestfs-performance.pod:105
+#: ../examples/guestfs-faq.pod:1315 ../examples/guestfs-faq.pod:1326
+#: ../examples/guestfs-faq.pod:1331 ../examples/guestfs-performance.pod:105
 #: ../examples/guestfs-performance.pod:111
 #: ../examples/guestfs-performance.pod:116
 #: ../examples/guestfs-performance.pod:243
@@ -1308,7 +1309,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115
 #: ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389
 #: ../erlang/examples/guestfs-erlang.pod:95
-#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1262
+#: ../examples/guestfs-examples.pod:55 ../examples/guestfs-faq.pod:1345
 #: ../examples/guestfs-performance.pod:561 ../examples/guestfs-recipes.pod:668
 #: ../examples/guestfs-testing.pod:384 ../fish/guestfish.pod:1595
 #: ../fish/libguestfs-tools.conf.pod:88 ../fish/virt-copy-in.pod:48
@@ -1379,7 +1380,7 @@ msgstr ""
 #: ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124
 #: ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404
 #: ../erlang/examples/guestfs-erlang.pod:114
-#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1272
+#: ../examples/guestfs-examples.pod:73 ../examples/guestfs-faq.pod:1355
 #: ../examples/guestfs-performance.pod:577 ../examples/guestfs-recipes.pod:687
 #: ../examples/guestfs-testing.pod:395 ../fish/guestfish.pod:1634
 #: ../fish/libguestfs-tools.conf.pod:100 ../fish/virt-copy-in.pod:62
@@ -1714,7 +1715,7 @@ msgstr ""
 #: ../appliance/libguestfs-make-fixed-appliance.pod:172
 #: ../customize/virt-customize.pod:271
 #: ../erlang/examples/guestfs-erlang.pod:110
-#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268
+#: ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1351
 #: ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683
 #: ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630
 #: ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58
@@ -1735,7 +1736,7 @@ msgstr ""
 #. type: textblock
 #: ../appliance/libguestfs-make-fixed-appliance.pod:174
 #: ../erlang/examples/guestfs-erlang.pod:112
-#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1270
+#: ../examples/guestfs-examples.pod:71 ../examples/guestfs-faq.pod:1353
 #: ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:685
 #: ../examples/guestfs-testing.pod:393 ../fish/guestfish.pod:1632
 #: ../fish/libguestfs-tools.conf.pod:98 ../fish/virt-copy-in.pod:60
@@ -12527,13 +12528,146 @@ msgid ""
 "the reasons for them."
 msgstr ""
 
-#. type: textblock
+#. type: =head1
+#: ../examples/guestfs-faq.pod:1262
+msgid "MISCELLANEOUS QUESTIONS"
+msgstr ""
+
+#. type: =head2
 #: ../examples/guestfs-faq.pod:1264
+msgid ""
+"Can I monitor the live disk activity of a virtual machine using libguestfs?"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1266
+msgid ""
+"A common request is to be able to use libguestfs to monitor the live disk "
+"activity of a guest, for example, to get notified every time a guest creates "
+"a new file.  Libguestfs does I<not> work in the way some people imagine, as "
+"you can see from this diagram:"
+msgstr ""
+
+#. type: verbatim
+#: ../examples/guestfs-faq.pod:1271
+#, no-wrap
+msgid ""
+"            ┌─────────────────────────────────────┐\n"
+"            │ monitoring program using libguestfs │\n"
+"            └─────────────────────────────────────┘\n"
+"                             ↓\n"
+" ┌───────────┐    ┌──────────────────────┐\n"
+" │ live VM   │    │ libguestfs appliance │\n"
+" ├───────────┤    ├──────────────────────┤\n"
+" │ kernel (1)│    │ appliance kernel (2) │\n"
+" └───────────┘    └──────────────────────┘\n"
+"      ↓                      ↓ (r/o connection)\n"
+"      ┌──────────────────────┐\n"
+"      |      disk image      |\n"
+"      └──────────────────────┘\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1285
+msgid ""
+"This scenario is safe (as long as you set the C<readonly> flag when adding "
+"the drive).  However the libguestfs appliance kernel (2) does not see all "
+"the changes made to the disk image, for two reasons:"
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1291
+msgid "i."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1293
+msgid ""
+"The VM kernel (1) can cache data in memory, so it doesn't appear in the disk "
+"image."
+msgstr ""
+
+#. type: =item
+#: ../examples/guestfs-faq.pod:1296
+msgid "ii."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1298
+msgid ""
+"The libguestfs appliance kernel (2) doesn't expect that the disk image is "
+"changing underneath it, so its own cache is not magically updated even when "
+"the VM kernel (1) does update the disk image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1304
+msgid ""
+"The only supported solution is to restart the entire libguestfs appliance "
+"whenever you want to look at changes in the disk image.  At the API level "
+"that corresponds to calling C<guestfs_shutdown> followed by "
+"C<guestfs_launch>, which is a heavyweight operation (see also L<guestfs-"
+"performance(3)>)."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1310
+msgid ""
+"There are some unsupported hacks you can try if relaunching the appliance is "
+"really too costly:"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1317
+msgid ""
+"Call C<guestfs_drop_caches (g, 3)>.  This causes all cached data help by the "
+"libguestfs appliance kernel (2) to be discarded, so it goes back to the disk "
+"image."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1321
+msgid ""
+"However this on its own is not sufficient, because qemu also caches some "
+"data.  You will also need to patch libguestfs to (re-)enable the "
+"C<cache=unsafe> mode.  See: L<https://rwmj.wordpress.com/2013/09/02/new-in-"
+"libguestfs-allow-cache-mode-to-be-selected/>"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1328
+msgid ""
+"Use a tool like L<virt-bmap|http://git.annexia.org/?p=virt-bmap.git> instead."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1333
+msgid "Run an agent inside the guest."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1337
+msgid ""
+"Nothing helps if the guest is making more fundamental changes (eg.  deleting "
+"filesystems).  For those kinds of things you must relaunch the appliance."
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1341
+msgid ""
+"(Note there is a third problem that you need to use consistent snapshots to "
+"really examine live disk images, but that's a general problem with using "
+"libguestfs against any live disk image.)"
+msgstr ""
+
+#. type: textblock
+#: ../examples/guestfs-faq.pod:1347
 msgid "L<guestfish(1)>, L<guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
-#: ../examples/guestfs-faq.pod:1274
+#: ../examples/guestfs-faq.pod:1357
 msgid "Copyright (C) 2012-2015 Red Hat Inc."
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 607241e..1166c33 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2015-01-10 08:39-0500\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -576,14 +576,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1453,7 +1453,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr "stiller Modus"
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2101,7 +2101,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2235,7 +2235,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2243,7 +2243,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2384,7 +2384,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2437,7 +2437,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2591,15 +2591,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2647,6 +2647,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7176,7 +7180,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr "Umwandlung wird ausgeführt …"
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8007,12 +8015,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/en_GB.po b/po/en_GB.po
index 932484c..b7a4f6a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7191,7 +7195,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8020,12 +8028,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/es.po b/po/es.po
index 33f0756..d09bfca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -571,14 +571,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1445,7 +1445,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2093,7 +2093,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2235,7 +2235,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2376,7 +2376,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2429,7 +2429,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2583,15 +2583,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2639,6 +2639,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7310,7 +7314,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8141,12 +8149,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "el tamaño de %s es irracional (%<PRIi64> bytes)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/eu.po b/po/eu.po
index 0145677..05727d5 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7157,7 +7161,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7986,12 +7994,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/fr.po b/po/fr.po
index 5dc36a3..306c6d9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -572,14 +572,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1446,7 +1446,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2094,7 +2094,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2228,7 +2228,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2236,7 +2236,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2377,7 +2377,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2430,7 +2430,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2584,15 +2584,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2640,6 +2640,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7460,7 +7464,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8325,12 +8333,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "taille déraisonnable de %s (%<PRIi64> octets)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/gu.po b/po/gu.po
index 4fb2ae7..68145f1 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7168,7 +7172,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7997,12 +8005,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/hi.po b/po/hi.po
index 6bbf77a..47d5c87 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7166,7 +7170,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7995,12 +8003,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/ja.po b/po/ja.po
index 219e2df..b3aa6f4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7437,7 +7441,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8306,12 +8314,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "%s の容量が不当です (%<PRIi64> バイト)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/kn.po b/po/kn.po
index 3376cfb..1db418a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7172,7 +7176,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8001,12 +8009,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 6a58f14..946a2a9 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.29.44\n"
+"Project-Id-Version: libguestfs 1.29.45\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+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"
@@ -566,14 +566,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1440,7 +1440,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2088,7 +2088,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2222,7 +2222,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2230,7 +2230,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2371,7 +2371,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2424,7 +2424,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2578,15 +2578,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2634,6 +2634,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7154,7 +7158,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7983,12 +7991,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/ml.po b/po/ml.po
index d716252..fb2e531 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7168,7 +7172,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7997,12 +8005,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/mr.po b/po/mr.po
index bb6d246..a14f963 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7235,7 +7239,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8064,12 +8072,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "%s चे आकार असमंजस आहे (%<PRIi64> बाईट्स्)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/nl.po b/po/nl.po
index 9e54831..24795c2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -571,14 +571,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1445,7 +1445,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2093,7 +2093,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2235,7 +2235,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2376,7 +2376,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2429,7 +2429,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2583,15 +2583,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2639,6 +2639,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7345,7 +7349,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8193,12 +8201,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "grootte van %s buitensporig (%<PRIi64> bytes)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/or.po b/po/or.po
index ef325c6..1fd98fb 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7166,7 +7170,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7995,12 +8003,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/pa.po b/po/pa.po
index 9d08536..02fb85d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7232,7 +7236,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8061,12 +8069,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "%s ਦਾ ਅਕਾਰ ਬੇਲੋੜਾ ਹੈ (%<PRIi64> bytes)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/pl.po b/po/pl.po
index f9af3ee..be7297a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -573,14 +573,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1447,7 +1447,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2095,7 +2095,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2229,7 +2229,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2237,7 +2237,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2378,7 +2378,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2431,7 +2431,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2585,15 +2585,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2641,6 +2641,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7360,7 +7364,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -8214,12 +8222,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "rozmiar %s jest nierozsądny (%<PRIi64> bajtów)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/ru.po b/po/ru.po
index 1dfee9a..b9189fe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/libguestfs/"
@@ -570,14 +570,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1444,7 +1444,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2092,7 +2092,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2226,7 +2226,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2234,7 +2234,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2375,7 +2375,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2428,7 +2428,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2582,15 +2582,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2638,6 +2638,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7158,7 +7162,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7987,12 +7995,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/ta.po b/po/ta.po
index 111b609..79b0bfe 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7167,7 +7171,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7996,12 +8004,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/te.po b/po/te.po
index ab8d363..78b5d3a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7164,7 +7168,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7993,12 +8001,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/tg.po b/po/tg.po
index 3162c15..69b43fa 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -568,14 +568,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1442,7 +1442,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2090,7 +2090,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2224,7 +2224,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2232,7 +2232,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2373,7 +2373,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2426,7 +2426,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2580,15 +2580,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2636,6 +2636,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7156,7 +7160,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7985,12 +7993,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/uk.po b/po/uk.po
index 779279e..55a97b8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -684,7 +684,7 @@ msgstr ""
 "-o libvirt: параметр --qemu-boot не можна використовувати у цьому режимі "
 "виведення даних"
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
@@ -694,7 +694,7 @@ msgstr ""
 "target/path або не існує або цей елемент не є локальним каталогом. Див. "
 "розділ «ВИВЕДЕННЯ ДО LIBVIRT» у підручнику virt-v2v(1)."
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1619,7 +1619,7 @@ msgstr "Вивести джерело і припинити обробку"
 msgid "Quiet output"
 msgstr "Працювати без виведення повідомлень"
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 "У RHEV не передбачено формату виведення даних «%s», лише формати raw та qcow2"
@@ -2384,7 +2384,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2536,7 +2536,7 @@ msgstr "Занулити файлову систему"
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2544,7 +2544,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2706,7 +2706,7 @@ msgstr "з'єднання закрито"
 msgid "could not add grub2 serial console (ignored)"
 msgstr "не вдалося додати послідовну консоль grub2 (проігноровано)"
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2771,7 +2771,7 @@ msgstr ""
 "виведені grub дані не буде надіслано до послідовного порту, але, окрім "
 "цього, не зашкодить. Початкове повідомлення щодо помилки: %s"
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr "не вдалося оновити буфер libvirt %s"
 
@@ -2946,15 +2946,15 @@ msgstr "у командному рядку мало бути вказано на
 msgid "expecting an OVA file name on the command line"
 msgstr "у командному рядку мало бути вказано назву файла OVA"
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr "виконання зовнішньої програми «%s» завершилося помилкою %d"
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr "виконання зовнішньої програми «%s» завершено сигналом %d"
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr "виконання зовнішньої програми «%s» зупинено сигналом %d"
 
@@ -3004,6 +3004,10 @@ msgstr "формат"
 msgid "fs"
 msgstr "fs"
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -8063,7 +8067,11 @@ msgstr "Налаштовуємо контрольне з’єднання…"
 msgid "Doing conversion ..."
 msgstr "Виконуємо перетворення…"
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr "З’єднання керування розірвано на віддаленому боці."
 
@@ -8981,12 +8989,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr "некоректний розмір %s (%<PRIi64> байтів)"
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a31d63f..0eb19dd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7157,7 +7161,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7986,12 +7994,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5d62b49..f2be307 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.29.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-26 21:42+0100\n"
+"POT-Creation-Date: 2015-06-02 17:12+0100\n"
 "PO-Revision-Date: 2014-10-18 04:00-0400\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
@@ -569,14 +569,14 @@ msgstr ""
 msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:368
+#: ../v2v/output_libvirt.ml:369
 msgid ""
 "-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
 "element either does not exist or is not a local directory.  See virt-v2v(1) "
 "section \"OUTPUT TO LIBVIRT\""
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:366
 msgid ""
 "-o libvirt: output pool '%s' is not a directory (type='dir').  See virt-"
 "v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -1443,7 +1443,7 @@ msgstr ""
 msgid "Quiet output"
 msgstr ""
 
-#: ../v2v/OVF.ml:389 ../v2v/OVF.ml:211
+#: ../v2v/OVF.ml:390 ../v2v/OVF.ml:211
 msgid "RHEV does not support the output format '%s', only raw or qcow2"
 msgstr ""
 
@@ -2091,7 +2091,7 @@ msgstr ""
 msgid "This guest has virtio drivers installed."
 msgstr ""
 
-#: ../v2v/OVF.ml:332
+#: ../v2v/OVF.ml:333
 msgid ""
 "This guest required a password for connection to its display, but this is "
 "not supported by RHEV.  Therefore the converted guest's display will not "
@@ -2225,7 +2225,7 @@ msgstr ""
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:339
+#: ../v2v/output_libvirt.ml:340
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2233,7 +2233,7 @@ msgid ""
 "delete the existing domain on the target using the 'virsh undefine' command."
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:342
+#: ../v2v/output_libvirt.ml:343
 msgid ""
 "a libvirt domain called '%s' already exists on the target.\n"
 "\n"
@@ -2374,7 +2374,7 @@ msgstr ""
 msgid "could not add grub2 serial console (ignored)"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:418
+#: ../v2v/output_libvirt.ml:419
 msgid ""
 "could not define libvirt domain.  The libvirt XML is still available in "
 "'%s'.  Try running 'virsh define %s' yourself instead."
@@ -2427,7 +2427,7 @@ msgid ""
 "harmless.  Original error message: %s"
 msgstr ""
 
-#: ../v2v/output_libvirt.ml:390
+#: ../v2v/output_libvirt.ml:391
 msgid "could not refresh libvirt pool %s"
 msgstr ""
 
@@ -2581,15 +2581,15 @@ msgstr ""
 msgid "expecting an OVA file name on the command line"
 msgstr ""
 
-#: ../mllib/common_utils.ml:569
+#: ../mllib/common_utils.ml:572
 msgid "external command '%s' exited with error %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:571
+#: ../mllib/common_utils.ml:574
 msgid "external command '%s' killed by signal %d"
 msgstr ""
 
-#: ../mllib/common_utils.ml:573
+#: ../mllib/common_utils.ml:576
 msgid "external command '%s' stopped by signal %d"
 msgstr ""
 
@@ -2637,6 +2637,10 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
+#: ../mllib/common_utils.ml:372
+msgid "generated by %s %s"
+msgstr ""
+
 #: ../builder/get_kernel.ml:42
 msgid "get-kernel: dual/multi-boot images are not supported by this tool"
 msgstr ""
@@ -7157,7 +7161,11 @@ msgstr ""
 msgid "Doing conversion ..."
 msgstr ""
 
-#: p2v/conversion.c:312
+#: p2v/conversion.c:309
+msgid "Conversion cancelled by user."
+msgstr ""
+
+#: p2v/conversion.c:314
 msgid "Control connection closed by remote."
 msgstr ""
 
@@ -7986,12 +7994,12 @@ msgid ""
 "To see full error messages you may need to enable debugging.\n"
 msgstr ""
 
-#: src/filearch.c:200 src/filearch.c:272
+#: src/filearch.c:208 src/filearch.c:280
 #, c-format
 msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/filearch.c:350
+#: src/filearch.c:359
 msgid ""
 "file-architecture API not available since this version of libguestfs was "
 "compiled without the libmagic library"

-- 
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