Pull latest translations from Transifex.

16 files changed, 3816 insertions, 3877 deletions

diff --git a/po-docs/ja.po b/po-docs/ja.po
index af3b832a..00f6abdf 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Red Hat Inc.
 # This file is distributed under the same license as the libguestfs package.
-#
+# 
 # Translators:
 # rjones <rjones@redhat.com>, 2011.
 #   <www.carrotsoft@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
-"Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
+"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/\n"
 "POT-Creation-Date: 2011-10-26 21:10+0200\n"
-"PO-Revision-Date: 2011-10-19 15:46+0000\n"
+"PO-Revision-Date: 2011-10-27 09:15+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: =head1
@@ -107,8 +107,8 @@ msgid ""
 "When older operating systems install themselves, the partitioning tools "
 "place partitions at a sector misaligned with the underlying storage "
 "(commonly the first partition starts on sector C<63>).  Misaligned "
-"partitions can result in an operating system issuing more I/O than should be "
-"necessary."
+"partitions can result in an operating system issuing more I/O than should be"
+" necessary."
 msgstr ""
 
 #. type: textblock
@@ -121,10 +121,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:25
 msgid ""
-"Currently there is no virt tool for fixing alignment problems.  You can only "
-"reinstall the guest operating system.  The following NetApp document "
-"summarises the problem and possible solutions: L<http://media.netapp.com/"
-"documents/tr-3747.pdf>"
+"Currently there is no virt tool for fixing alignment problems.  You can only"
+" reinstall the guest operating system.  The following NetApp document "
+"summarises the problem and possible solutions: "
+"L<http://media.netapp.com/documents/tr-3747.pdf>"
 msgstr ""
 
 #. type: =head1
@@ -328,8 +328,8 @@ msgstr ""
 #: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:102
 #: ../inspector/virt-inspector.pod:71 ../rescue/virt-rescue.pod:100
 msgid ""
-"The format of the disk image is auto-detected.  To override this and force a "
-"particular format use the I<--format=..> option."
+"The format of the disk image is auto-detected.  To override this and force a"
+" particular format use the I<--format=..> option."
 msgstr ""
 
 #. type: =item
@@ -597,10 +597,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:174
 msgid ""
-"Operating systems older than Windows 2008 and Linux before ca.2010 place the "
-"first sector of the first partition at sector 63, with a 512 byte sector "
-"size.  This happens because of a historical accident.  Drives have to report "
-"a cylinder / head / sector (CHS) geometry to the BIOS.  The geometry is "
+"Operating systems older than Windows 2008 and Linux before ca.2010 place the"
+" first sector of the first partition at sector 63, with a 512 byte sector "
+"size.  This happens because of a historical accident.  Drives have to report"
+" a cylinder / head / sector (CHS) geometry to the BIOS.  The geometry is "
 "completely meaningless on modern drives, but it happens that the geometry "
 "reported always has 63 sectors per track.  The operating system therefore "
 "places the first partition at the start of the second \"track\", at sector "
@@ -622,8 +622,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:190
 msgid ""
-"if the host OS uses local storage directly on hard drive partitions, and the "
-"hard drive has 512 byte physical sectors."
+"if the host OS uses local storage directly on hard drive partitions, and the"
+" hard drive has 512 byte physical sectors."
 msgstr ""
 
 #. type: =item
@@ -700,8 +700,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:229
 msgid ""
-"New versions of the Linux kernel expose the physical and logical block size, "
-"and minimum and recommended I/O size."
+"New versions of the Linux kernel expose the physical and logical block size,"
+" and minimum and recommended I/O size."
 msgstr ""
 
 #. type: textblock
@@ -754,9 +754,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:258
 msgid ""
-"For detailed information about what these numbers mean, see L<http://docs."
-"redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/"
-"Storage_Administration_Guide/newstorage-iolimits.html>"
+"For detailed information about what these numbers mean, see "
+"L<http://docs.redhat.com/docs/en-"
+"US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/newstorage-"
+"iolimits.html>"
 msgstr ""
 
 #. type: textblock
@@ -781,9 +782,9 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:269
 msgid ""
-"Assuming 512 byte sectors in the guest, you will now see the first partition "
-"starting at sector 2048, and subsequent partitions (if any)  will start at a "
-"multiple of 2048 sectors."
+"Assuming 512 byte sectors in the guest, you will now see the first partition"
+" starting at sector 2048, and subsequent partitions (if any)  will start at "
+"a multiple of 2048 sectors."
 msgstr ""
 
 #. type: textblock
@@ -801,11 +802,11 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:278
 msgid ""
-"L<virt-resize(1)> can change the alignment of the partitions of some "
-"guests.  Currently it can fully align all the partitions of all Windows "
-"guests, and it will fix the bootloader where necessary.  For Linux guests, "
-"it can align the second and subsequent partitions, so the majority of OS "
-"accesses except at boot will be aligned."
+"L<virt-resize(1)> can change the alignment of the partitions of some guests."
+"  Currently it can fully align all the partitions of all Windows guests, and"
+" it will fix the bootloader where necessary.  For Linux guests, it can align"
+" the second and subsequent partitions, so the majority of OS accesses except"
+" at boot will be aligned."
 msgstr ""
 
 #. type: textblock
@@ -819,17 +820,17 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:288
 msgid ""
-"For older versions of Windows, the following NetApp document contains useful "
-"information: L<http://media.netapp.com/documents/tr-3747.pdf>"
+"For older versions of Windows, the following NetApp document contains useful"
+" information: L<http://media.netapp.com/documents/tr-3747.pdf>"
 msgstr ""
 
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:291
 msgid ""
 "For Red Hat Enterprise Linux E<le> 5, use a Kickstart script that contains "
-"an explicit C<%pre> section that creates aligned partitions using L<parted(8)"
-">.  Do not use the Kickstart C<part> command.  The NetApp document above "
-"contains an example."
+"an explicit C<%pre> section that creates aligned partitions using "
+"L<parted(8)>.  Do not use the Kickstart C<part> command.  The NetApp "
+"document above contains an example."
 msgstr ""
 
 #. type: =head1
@@ -856,8 +857,8 @@ msgstr ""
 msgid ""
 "Libvirt guest names can contain arbitrary characters, some of which have "
 "meaning to the shell such as C<#> and space.  You may need to quote or "
-"escape these characters on the command line.  See the shell manual page L<sh"
-"(1)> for details."
+"escape these characters on the command line.  See the shell manual page "
+"L<sh(1)> for details."
 msgstr ""
 
 #. type: =head1
@@ -998,8 +999,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:332
 msgid ""
-"successful exit, some partitions have alignment E<lt> 4K which can result in "
-"poor performance on most hypervisors"
+"successful exit, some partitions have alignment E<lt> 4K which can result in"
+" poor performance on most hypervisors"
 msgstr ""
 
 #. type: =head1
@@ -1026,8 +1027,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:339
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-rescue(1)>, "
-"L<virt-resize(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-rescue(1)>, L"
+"<virt-resize(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: =head1
@@ -1135,9 +1136,9 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:600 ../tools/virt-tar.pl:329
 #: ../tools/virt-win-reg.pl:801
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"You should have received a copy of the GNU General Public License along with"
+" this program; if not, write to the Free Software Foundation, Inc., 675 Mass"
+" Ave, Cambridge, MA 02139, USA."
 msgstr ""
 
 #. type: textblock
@@ -1194,8 +1195,8 @@ msgstr ""
 #: ../cat/virt-cat.pod:24
 msgid ""
 "Multiple filenames can be given, in which case they are concatenated "
-"together.  Each filename must be a full path, starting at the root directory "
-"(starting with '/')."
+"together.  Each filename must be a full path, starting at the root directory"
+" (starting with '/')."
 msgstr ""
 
 #. type: textblock
@@ -1305,8 +1306,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:67 ../rescue/virt-rescue.pod:96
 msgid ""
 "Add I<file> which should be a disk image from a virtual machine.  If the "
-"virtual machine has multiple block devices, you must supply all of them with "
-"separate I<-a> options."
+"virtual machine has multiple block devices, you must supply all of them with"
+" separate I<-a> options."
 msgstr ""
 
 #. type: =item
@@ -1319,10 +1320,10 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-cat.pod:100
 msgid ""
-"When prompting for keys and passphrases, virt-cat normally turns echoing off "
-"so you cannot see what you are typing.  If you are not worried about Tempest "
-"attacks and there is no one else in the room you can specify this flag to "
-"see what you are typing."
+"When prompting for keys and passphrases, virt-cat normally turns echoing off"
+" so you cannot see what you are typing.  If you are not worried about "
+"Tempest attacks and there is no one else in the room you can specify this "
+"flag to see what you are typing."
 msgstr ""
 
 #. type: verbatim
@@ -1353,8 +1354,8 @@ msgstr ""
 #: ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291
 #: ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:116
 msgid ""
-"Read key or passphrase parameters from stdin.  The default is to try to read "
-"passphrases from the user by opening C</dev/tty>."
+"Read key or passphrase parameters from stdin.  The default is to try to read"
+" passphrases from the user by opening C</dev/tty>."
 msgstr ""
 
 #. type: =head1
@@ -1492,8 +1493,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-cat.pod:221
 msgid ""
-"The command above uses libguestfs's guest inspection feature and so does not "
-"work on guests that libguestfs cannot inspect, or on things like arbitrary "
+"The command above uses libguestfs's guest inspection feature and so does not"
+" work on guests that libguestfs cannot inspect, or on things like arbitrary "
 "disk images that don't contain guests.  To display a file from a disk image "
 "directly, use:"
 msgstr ""
@@ -1525,8 +1526,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-cat.pod:245
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L<virt-"
-"tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L"
+"<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -1562,8 +1563,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:15
 msgid ""
 "This tool allows you to discover filesystems, partitions, logical volumes, "
-"and their sizes in a disk image or virtual machine.  It is a replacement for "
-"L<virt-list-filesystems(1)> and L<virt-list-partitions(1)>."
+"and their sizes in a disk image or virtual machine.  It is a replacement for"
+" L<virt-list-filesystems(1)> and L<virt-list-partitions(1)>."
 msgstr ""
 
 #. type: textblock
@@ -1665,8 +1666,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:64
 msgid ""
-"Similarly you can use I<--logical-volumes>, I<--volume-groups>, I<--physical-"
-"volumes>, I<--block-devices> to list those items."
+"Similarly you can use I<--logical-volumes>, I<--volume-groups>, I"
+"<--physical-volumes>, I<--block-devices> to list those items."
 msgstr ""
 
 #. type: textblock
@@ -1683,8 +1684,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:74
 msgid ""
-"UUIDs (because they are quite long) are not shown by default.  Add the I<--"
-"uuid> option to display device and filesystem UUIDs in the long output."
+"UUIDs (because they are quite long) are not shown by default.  Add the "
+"I<--uuid> option to display device and filesystem UUIDs in the long output."
 msgstr ""
 
 #. type: textblock
@@ -1722,10 +1723,10 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:112
 msgid ""
-"Display everything.  This is currently the same as specifying these options: "
-"I<--filesystems>, I<--extra>, I<--partitions>, I<--block-devices>, I<--"
-"logical-volumes>, I<--volume-groups>, I<--physical-volumes>.  (More may be "
-"added to this list in future)."
+"Display everything.  This is currently the same as specifying these options:"
+" I<--filesystems>, I<--extra>, I<--partitions>, I<--block-devices>, I"
+"<--logical-volumes>, I<--volume-groups>, I<--physical-volumes>.  (More may "
+"be added to this list in future)."
 msgstr ""
 
 #. type: textblock
@@ -1779,8 +1780,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:157
 msgid ""
 "This causes filesystems that are not ordinary, mountable filesystems to be "
-"displayed.  This category includes swapspace, and filesystems that are empty "
-"or contain unknown data."
+"displayed.  This category includes swapspace, and filesystems that are empty"
+" or contain unknown data."
 msgstr ""
 
 #. type: textblock
@@ -1865,8 +1866,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:213
 msgid ""
 "The extra columns displayed depend on what output you select, and the "
-"ordering of columns may change in future versions.  Use the title row, I<--"
-"csv> output and/or L<csvtool(1)> to match columns to data in external "
+"ordering of columns may change in future versions.  Use the title row, "
+"I<--csv> output and/or L<csvtool(1)> to match columns to data in external "
 "programs."
 msgstr ""
 
@@ -1900,8 +1901,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:229
 msgid ""
-"Display LVM logical volumes.  In this mode, these are displayed irrespective "
-"of whether the LVs contain filesystems."
+"Display LVM logical volumes.  In this mode, these are displayed irrespective"
+" of whether the LVs contain filesystems."
 msgstr ""
 
 #. type: =item
@@ -2020,8 +2021,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:298
 msgid ""
 "For device and partition names these are displayed as canonical libguestfs "
-"names, so that for example C</dev/sda2> is the second partition on the first "
-"device."
+"names, so that for example C</dev/sda2> is the second partition on the first"
+" device."
 msgstr ""
 
 #. type: textblock
@@ -2074,8 +2075,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:321
 msgid ""
 "The partition type byte, displayed as a two digit hexadecimal number.  A "
-"comprehensive list of partition types can be found here: L<http://www.win."
-"tue.nl/~aeb/partitions/partition_types-1.html>"
+"comprehensive list of partition types can be found here: "
+"L<http://www.win.tue.nl/~aeb/partitions/partition_types-1.html>"
 msgstr ""
 
 #. type: textblock
@@ -2104,9 +2105,9 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:334
 msgid ""
 "The parent column records the parent relationship between objects.  For "
-"example, if the object is a partition, then this column contains the name of "
-"the containing device.  If the object is a logical volume, then this column "
-"is the name of the volume group."
+"example, if the object is a partition, then this column contains the name of"
+" the containing device.  If the object is a logical volume, then this column"
+" is the name of the volume group."
 msgstr ""
 
 #. type: =item
@@ -2144,8 +2145,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:354 ../cat/virt-ls.pod:464
 #: ../df/virt-df.pod:196
 msgid ""
-"Myth: Just split fields at commas.  Reality: This does I<not> work "
-"reliably.  This example has two columns:"
+"Myth: Just split fields at commas.  Reality: This does I<not> work reliably."
+"  This example has two columns:"
 msgstr ""
 
 #. type: verbatim
@@ -2187,8 +2188,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:368 ../cat/virt-ls.pod:478
 #: ../df/virt-df.pod:210
 msgid ""
-"For other languages, use a CSV processing library (eg. C<Text::CSV> for Perl "
-"or Python's built-in csv library)."
+"For other languages, use a CSV processing library (eg. C<Text::CSV> for Perl"
+" or Python's built-in csv library)."
 msgstr ""
 
 #. type: textblock
@@ -2201,8 +2202,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:387
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
-"libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -2262,23 +2263,23 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:24
 msgid ""
-"Multiple directory names can be given, in which case the output from each is "
-"concatenated."
+"Multiple directory names can be given, in which case the output from each is"
+" concatenated."
 msgstr ""
 
 #. type: textblock
 #: ../cat/virt-ls.pod:27
 msgid ""
-"To list directories from a libvirt guest use the I<-d> option to specify the "
-"name of the guest.  For a disk image, use the I<-a> option."
+"To list directories from a libvirt guest use the I<-d> option to specify the"
+" name of the guest.  For a disk image, use the I<-a> option."
 msgstr ""
 
 #. type: textblock
 #: ../cat/virt-ls.pod:31
 msgid ""
-"C<virt-ls> can do many simple file listings.  For more complicated cases you "
-"may need to use L<guestfish(1)>, or write a program directly to the L<guestfs"
-"(3)> API."
+"C<virt-ls> can do many simple file listings.  For more complicated cases you"
+" may need to use L<guestfish(1)>, or write a program directly to the "
+"L<guestfs(3)> API."
 msgstr ""
 
 #. type: textblock
@@ -2393,8 +2394,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:71
 msgid ""
-"Find the differences between files in a guest and an earlier snapshot of the "
-"same guest."
+"Find the differences between files in a guest and an earlier snapshot of the"
+" same guest."
 msgstr ""
 
 #. type: verbatim
@@ -2411,10 +2412,10 @@ msgstr ""
 #: ../cat/virt-ls.pod:78
 msgid ""
 "The commands above won't find files where the content has changed but the "
-"metadata (eg. file size and modification date) is the same.  To do that, you "
-"need to add the I<--checksum> parameter to both C<virt-ls> commands.  I<--"
-"checksum> can be quite slow since it has to read and compute a checksum of "
-"every regular file in the virtual machine."
+"metadata (eg. file size and modification date) is the same.  To do that, you"
+" need to add the I<--checksum> parameter to both C<virt-ls> commands.  "
+"I<--checksum> can be quite slow since it has to read and compute a checksum "
+"of every regular file in the virtual machine."
 msgstr ""
 
 #. type: =head1
@@ -2528,8 +2529,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:132
 msgid ""
-"Most of the interesting features of C<virt-ls> are only available when using "
-"I<-lR> mode."
+"Most of the interesting features of C<virt-ls> are only available when using"
+" I<-lR> mode."
 msgstr ""
 
 #. type: textblock
@@ -2537,11 +2538,11 @@ msgstr ""
 msgid ""
 "The fields are normally space-separated.  Filenames are B<not> quoted, so "
 "you cannot use the output in another program (because filenames can contain "
-"spaces and other unsafe characters).  If the guest was untrusted and someone "
-"knew you were using C<virt-ls> to analyze the guest, they could play tricks "
-"on you by creating filenames with embedded newline characters.  To B<safely> "
-"parse the output in another program, use the I<--csv> (Comma-Separated "
-"Values) option."
+"spaces and other unsafe characters).  If the guest was untrusted and someone"
+" knew you were using C<virt-ls> to analyze the guest, they could play tricks"
+" on you by creating filenames with embedded newline characters.  To "
+"B<safely> parse the output in another program, use the I<--csv> (Comma-"
+"Separated Values) option."
 msgstr ""
 
 #. type: textblock
@@ -2797,8 +2798,8 @@ msgstr ""
 #: ../cat/virt-ls.pod:316
 msgid ""
 "When prompting for keys and passphrases, virt-ls normally turns echoing off "
-"so you cannot see what you are typing.  If you are not worried about Tempest "
-"attacks and there is no one else in the room you can specify this flag to "
+"so you cannot see what you are typing.  If you are not worried about Tempest"
+" attacks and there is no one else in the room you can specify this flag to "
 "see what you are typing."
 msgstr ""
 
@@ -2854,8 +2855,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:378
 msgid ""
-"C<virt-ls -l> produces a \"long listing\", which shows more detail.  See L</"
-"LONG LISTING>."
+"C<virt-ls -l> produces a \"long listing\", which shows more detail.  See "
+"L</LONG LISTING>."
 msgstr ""
 
 #. type: textblock
@@ -2989,10 +2990,10 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:15
 msgid ""
-"Virt-sysprep \"resets\" or \"unconfigures\" a virtual machine so that clones "
-"can be made from it.  Steps in this process include removing SSH host keys, "
-"removing persistent network MAC configuration, and removing user accounts.  "
-"Each step can be enabled or disabled as required."
+"Virt-sysprep \"resets\" or \"unconfigures\" a virtual machine so that clones"
+" can be made from it.  Steps in this process include removing SSH host keys,"
+" removing persistent network MAC configuration, and removing user accounts."
+"  Each step can be enabled or disabled as required."
 msgstr ""
 
 #. type: textblock
@@ -3007,15 +3008,16 @@ msgstr ""
 msgid ""
 "Virt-sysprep modifies the guest or disk image I<in place>.  The guest must "
 "be shut down.  If you want to preserve the existing contents of the guest, "
-"you I<must copy or clone the disk first>.  See L</COPYING AND CLONING> below."
+"you I<must copy or clone the disk first>.  See L</COPYING AND CLONING> "
+"below."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:29
 msgid ""
 "You do I<not> need to run virt-sysprep as root.  In fact we'd generally "
-"recommend that you don't.  The time you might want to run it as root is when "
-"you need root in order to access the disk image, but even in this case it "
+"recommend that you don't.  The time you might want to run it as root is when"
+" you need root in order to access the disk image, but even in this case it "
 "would be better to change the permissions on the disk image to be writable "
 "as the non-root user running virt-sysprep."
 msgstr ""
@@ -3023,8 +3025,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:35
 msgid ""
-"\"Sysprep\" stands for \"system preparation\" tool.  The name comes from the "
-"Microsoft program C<sysprep.exe> which is used to unconfigure Windows "
+"\"Sysprep\" stands for \"system preparation\" tool.  The name comes from the"
+" Microsoft program C<sysprep.exe> which is used to unconfigure Windows "
 "machines in preparation for cloning them.  Having said that, virt-sysprep "
 "does I<not> currently work on Microsoft Windows guests.  We plan to support "
 "Windows sysprepping in a future version, and we already have code to do it."
@@ -3135,8 +3137,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:135
 msgid ""
-"The default is to try to detect if SELinux relabelling is required.  See L</"
-"SELINUX RELABELLING> below for more details."
+"The default is to try to detect if SELinux relabelling is required.  See "
+"L</SELINUX RELABELLING> below for more details."
 msgstr ""
 
 #. type: =head1
@@ -3147,8 +3149,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:158
 msgid ""
-"If the I<--enable> option is I<not> given, then I<all sysprep operations are "
-"enabled>, although some are skipped depending on the type of guest."
+"If the I<--enable> option is I<not> given, then I<all sysprep operations are"
+" enabled>, although some are skipped depending on the type of guest."
 msgstr ""
 
 #. type: textblock
@@ -3169,8 +3171,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:167
 msgid ""
-"To list the operations supported by the current version of virt-sysprep, use "
-"I<--list-operations>."
+"To list the operations supported by the current version of virt-sysprep, use"
+" I<--list-operations>."
 msgstr ""
 
 #. type: textblock
@@ -3226,8 +3228,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:191
 msgid ""
-"If the I<--hostname> parameter is not given, then the hostname is changed to "
-"C<localhost.localdomain>."
+"If the I<--hostname> parameter is not given, then the hostname is changed to"
+" C<localhost.localdomain>."
 msgstr ""
 
 #. type: =head2
@@ -3270,7 +3272,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:209
 msgid ""
-"Write some random bytes from the host into the random seed file of the guest."
+"Write some random bytes from the host into the random seed file of the "
+"guest."
 msgstr ""
 
 #. type: textblock
@@ -3348,8 +3351,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:242
 msgid ""
-"After a guest is cloned, the MAC address usually changes.  Since the old MAC "
-"address occupies the old name (eg. eth0), this means the fresh MAC address "
+"After a guest is cloned, the MAC address usually changes.  Since the old MAC"
+" address occupies the old name (eg. eth0), this means the fresh MAC address "
 "is assigned to a new name (eg. eth1) and this is usually undesirable.  "
 "Erasing the udev persistent net rules avoids this."
 msgstr ""
@@ -3513,8 +3516,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:349
 msgid ""
-"You can, of course, just copy the block device on the host using L<cp(1)> or "
-"L<dd(1)>."
+"You can, of course, just copy the block device on the host using L<cp(1)> or"
+" L<dd(1)>."
 msgstr ""
 
 #. type: verbatim
@@ -3549,23 +3552,23 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:370
 msgid ""
-"Use the block device as a backing file and create a snapshot on top for each "
-"guest.  The advantage is that you don't need to copy the block device (very "
-"fast) and only changes are stored (less storage required)."
+"Use the block device as a backing file and create a snapshot on top for each"
+" guest.  The advantage is that you don't need to copy the block device (very"
+" fast) and only changes are stored (less storage required)."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:375
 msgid ""
-"Note that writing to the backing file once you have created guests on top of "
-"it is not possible: you will corrupt the guests."
+"Note that writing to the backing file once you have created guests on top of"
+" it is not possible: you will corrupt the guests."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:378
 msgid ""
-"Tools that can do this include: L<qemu-img(1)> (with the I<create -f qcow2 -"
-"o backing_file> option), L<lvcreate(8)> (I<--snapshot> option).  Some "
+"Tools that can do this include: L<qemu-img(1)> (with the I<create -f qcow2 "
+"-o backing_file> option), L<lvcreate(8)> (I<--snapshot> option).  Some "
 "filesystems (such as btrfs) and most Network Attached Storage devices can "
 "also create cheap snapshots from files or LUNs."
 msgstr ""
@@ -3588,9 +3591,9 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:396
 msgid ""
-"A separate tool, L<virt-clone(1)>, can be used to duplicate the block device "
-"and/or modify the external libvirt configuration of a guest.  It will reset "
-"the name, UUID and MAC address of the guest in the libvirt XML."
+"A separate tool, L<virt-clone(1)>, can be used to duplicate the block device"
+" and/or modify the external libvirt configuration of a guest.  It will reset"
+" the name, UUID and MAC address of the guest in the libvirt XML."
 msgstr ""
 
 #. type: textblock
@@ -3617,8 +3620,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:409
 msgid ""
-"L<virt-sparsify(1)> can be used to make the cloning template smaller, making "
-"it easier to compress and/or faster to copy."
+"L<virt-sparsify(1)> can be used to make the cloning template smaller, making"
+" it easier to compress and/or faster to copy."
 msgstr ""
 
 #. type: textblock
@@ -3650,9 +3653,9 @@ msgstr ""
 msgid ""
 "If you want to give people cloned guests, but let them pick the size of the "
 "guest themselves (eg. depending on how much they are prepared to pay for "
-"disk space), then instead of copying the template, you can run L<virt-resize"
-"(1)>.  Virt-resize performs a copy and resize, and thus is ideal for cloning "
-"guests from a template."
+"disk space), then instead of copying the template, you can run L<virt-"
+"resize(1)>.  Virt-resize performs a copy and resize, and thus is ideal for "
+"cloning guests from a template."
 msgstr ""
 
 #. type: =head1
@@ -3664,18 +3667,19 @@ msgstr ""
 #: ../clone/virt-sysprep.pod:431
 msgid ""
 "Although virt-sysprep removes some sensitive information from the guest, it "
-"does not pretend to remove all of it.  You should examine the L</OPERATIONS> "
-"above, and the implementation of the operations in the shell script.  You "
+"does not pretend to remove all of it.  You should examine the L</OPERATIONS>"
+" above, and the implementation of the operations in the shell script.  You "
 "should also examine the guest afterwards."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:436
 msgid ""
-"Sensitive files are simply removed.  The data they contained may still exist "
-"on the disk, easily recovered with a hex editor or undelete tool.  Use "
-"L<virt-sparsify(1)> as one way to remove this content.  See also the L<scrub"
-"(1)> command to get rid of deleted content in directory entries and inodes."
+"Sensitive files are simply removed.  The data they contained may still exist"
+" on the disk, easily recovered with a hex editor or undelete tool.  Use L"
+"<virt-sparsify(1)> as one way to remove this content.  See also the "
+"L<scrub(1)> command to get rid of deleted content in directory entries and "
+"inodes."
 msgstr ""
 
 #. type: =head2
@@ -3733,10 +3737,10 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:464
 msgid ""
-"If any new files are created by virt-sysprep, then virt-sysprep touches C</."
-"autorelabel> so that these will be correctly labelled by SELinux the next "
-"time the guest is booted.  This process interrupts boot and can take some "
-"time."
+"If any new files are created by virt-sysprep, then virt-sysprep touches "
+"C</.autorelabel> so that these will be correctly labelled by SELinux the "
+"next time the guest is booted.  This process interrupts boot and can take "
+"some time."
 msgstr ""
 
 #. type: textblock
@@ -3762,8 +3766,8 @@ msgstr ""
 #: ../clone/virt-sysprep.pod:488
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, L<virt-"
-"resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-img(1)"
-">, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
+"resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-"
+"img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 msgstr ""
 
 #. type: textblock
@@ -3823,20 +3827,20 @@ msgstr ""
 #. type: textblock
 #: ../df/virt-df.pod:28
 msgid ""
-"If used without any I<-a> or I<-d> arguments, C<virt-df> checks with libvirt "
-"to get a list of all active and inactive guests, and performs a C<df>-type "
+"If used without any I<-a> or I<-d> arguments, C<virt-df> checks with libvirt"
+" to get a list of all active and inactive guests, and performs a C<df>-type "
 "operation on each one in turn, printing out the results."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:32
 msgid ""
-"If any I<-a> or I<-d> arguments are specified, C<virt-df> performs a C<df>-"
-"type operation on either the single named libvirt domain, or on the disk "
-"image(s) listed on the command line (which must all belong to a single VM).  "
-"In this mode (with arguments), C<virt-df> will I<only work for a single "
-"guest>.  If you want to run on multiple guests, then you have to invoke "
-"C<virt-df> multiple times."
+"If any I<-a> or I<-d> arguments are specified, C<virt-df> performs a "
+"C<df>-type operation on either the single named libvirt domain, or on the "
+"disk image(s) listed on the command line (which must all belong to a single "
+"VM).  In this mode (with arguments), C<virt-df> will I<only work for a "
+"single guest>.  If you want to run on multiple guests, then you have to "
+"invoke C<virt-df> multiple times."
 msgstr ""
 
 #. type: textblock
@@ -3940,8 +3944,8 @@ msgstr ""
 #. type: textblock
 #: ../df/virt-df.pod:150
 msgid ""
-"If you think an untrusted guest might actively try to exploit the libguestfs "
-"appliance kernel, then this prevents one guest from interfering with the "
+"If you think an untrusted guest might actively try to exploit the libguestfs"
+" appliance kernel, then this prevents one guest from interfering with the "
 "stats printed for another guest."
 msgstr ""
 
@@ -3957,23 +3961,23 @@ msgstr ""
 #: ../df/virt-df.pod:165
 msgid ""
 "Print UUIDs instead of names.  This is useful for following a guest even "
-"when the guest is migrated or renamed, or when two guests happen to have the "
-"same name."
+"when the guest is migrated or renamed, or when two guests happen to have the"
+" same name."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:169
 msgid ""
-"Note that only domains that we fetch from libvirt come with UUIDs.  For disk "
-"images, we still print the disk image name even when this option is "
+"Note that only domains that we fetch from libvirt come with UUIDs.  For disk"
+" images, we still print the disk image name even when this option is "
 "specified."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:229
 msgid ""
-"L<df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<http://"
-"libguestfs.org/>."
+"L<df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -4047,8 +4051,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:32
 msgid ""
-"Multiple filenames can be given, in which case they are each edited in "
-"turn.  Each filename must be a full path, starting at the root directory "
+"Multiple filenames can be given, in which case they are each edited in turn."
+"  Each filename must be a full path, starting at the root directory "
 "(starting with '/')."
 msgstr ""
 
@@ -4060,8 +4064,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:38
 msgid ""
-"For more complex cases you should look at the L<guestfish(1)> tool (see L</"
-"USING GUESTFISH> below)."
+"For more complex cases you should look at the L<guestfish(1)> tool (see "
+"L</USING GUESTFISH> below)."
 msgstr ""
 
 #. type: textblock
@@ -4133,15 +4137,15 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:85
 msgid ""
-"Create a backup of the original file I<in the guest disk image>.  The backup "
-"has the original filename with C<extension> added."
+"Create a backup of the original file I<in the guest disk image>.  The backup"
+" has the original filename with C<extension> added."
 msgstr ""
 
 #. type: textblock
 #: ../edit/virt-edit.pod:88
 msgid ""
-"Usually the first character of C<extension> would be a dot C<.> so you would "
-"write:"
+"Usually the first character of C<extension> would be a dot C<.> so you would"
+" write:"
 msgstr ""
 
 #. type: verbatim
@@ -4178,7 +4182,8 @@ msgstr ""
 #: ../tools/virt-list-partitions.pl:85 ../tools/virt-tar.pl:134
 #: ../tools/virt-win-reg.pl:135
 msgid ""
-"If you specify guest block devices directly, then libvirt is not used at all."
+"If you specify guest block devices directly, then libvirt is not used at "
+"all."
 msgstr ""
 
 #. type: textblock
@@ -4211,8 +4216,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:127
 msgid ""
-"Be careful to properly quote the expression to prevent it from being altered "
-"by the shell."
+"Be careful to properly quote the expression to prevent it from being altered"
+" by the shell."
 msgstr ""
 
 #. type: textblock
@@ -4325,8 +4330,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:226
 msgid ""
-"To delete a line, set C<$_> to the empty string.  For example, to delete the "
-"C<apache> user account from the password file you can do:"
+"To delete a line, set C<$_> to the empty string.  For example, to delete the"
+" C<apache> user account from the password file you can do:"
 msgstr ""
 
 #. type: verbatim
@@ -4340,8 +4345,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:231
 msgid ""
-"To insert a line, prepend or append it to C<$_>.  However appending lines to "
-"the end of the file is rather difficult this way since there is no concept "
+"To insert a line, prepend or append it to C<$_>.  However appending lines to"
+" the end of the file is rather difficult this way since there is no concept "
 "of \"last line of the file\" - your expression just doesn't get called "
 "again.  You might want to use the first method (setting C<$EDITOR>) if you "
 "want to do this."
@@ -4357,18 +4362,18 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:240
 msgid ""
-"The return value from the expression is ignored, but the expression may call "
-"C<die> in order to abort the whole program, leaving the original file "
+"The return value from the expression is ignored, but the expression may call"
+" C<die> in order to abort the whole program, leaving the original file "
 "untouched."
 msgstr ""
 
 #. type: textblock
 #: ../edit/virt-edit.pod:244
 msgid ""
-"Remember when matching the end of a line that C<$_> may contain the final C<"
-"\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
-"newline then neither of these.  Thus to match or substitute some text at the "
-"end of a line, use this regular expression:"
+"Remember when matching the end of a line that C<$_> may contain the final "
+"C<\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
+"newline then neither of these.  Thus to match or substitute some text at the"
+" end of a line, use this regular expression:"
 msgstr ""
 
 #. type: verbatim
@@ -4382,8 +4387,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:251
 msgid ""
-"Alternately, use the perl C<chomp> function, being careful not to chomp C<"
-"$_> itself (since that would remove all newlines from the file):"
+"Alternately, use the perl C<chomp> function, being careful not to chomp "
+"C<$_> itself (since that would remove all newlines from the file):"
 msgstr ""
 
 #. type: verbatim
@@ -4438,8 +4443,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:309
 msgid ""
-"The command above uses libguestfs's guest inspection feature and so does not "
-"work on guests that libguestfs cannot inspect, or on things like arbitrary "
+"The command above uses libguestfs's guest inspection feature and so does not"
+" work on guests that libguestfs cannot inspect, or on things like arbitrary "
 "disk images that don't contain guests.  To edit a file on a disk image "
 "directly, use:"
 msgstr ""
@@ -4505,8 +4510,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:335
 msgid ""
-"If set, this string is used as the editor.  It may contain arguments, eg. C<"
-"\"emacs -nw\">"
+"If set, this string is used as the editor.  It may contain arguments, eg. "
+"C<\"emacs -nw\">"
 msgstr ""
 
 #. type: textblock
@@ -4545,8 +4550,8 @@ msgstr ""
 msgid ""
 "This manual page documents how to call libguestfs from the Erlang "
 "programming language.  This page just documents the differences from the C "
-"API and gives some examples.  If you are not familiar with using libguestfs, "
-"you also need to read L<guestfs(3)>."
+"API and gives some examples.  If you are not familiar with using libguestfs,"
+" you also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -4580,7 +4585,8 @@ msgstr ""
 
 #. type: textblock
 #: ../erlang/examples/guestfs-erlang.pod:33
-msgid "C<G> is the libguestfs handle which you should pass to other functions."
+msgid ""
+"C<G> is the libguestfs handle which you should pass to other functions."
 msgstr ""
 
 #. type: textblock
@@ -4745,8 +4751,8 @@ msgstr ""
 #. type: textblock
 #: ../erlang/examples/guestfs-erlang.pod:99
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)"
-">, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-java(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://www.erlang.org/>.  L<http://libguestfs.org/>."
 msgstr ""
 
@@ -4806,8 +4812,8 @@ msgstr ""
 #: ../ruby/examples/guestfs-ruby.pod:59 ../src/guestfs.pod:3357
 msgid ""
 "This library is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU Lesser General Public License as published by the "
-"Free Software Foundation; either version 2 of the License, or (at your "
+"under the terms of the GNU Lesser General Public License as published by the"
+" Free Software Foundation; either version 2 of the License, or (at your "
 "option) any later version."
 msgstr ""
 
@@ -4822,8 +4828,8 @@ msgstr ""
 msgid ""
 "This library is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
-"for more details."
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License"
+" for more details."
 msgstr ""
 
 #. type: textblock
@@ -4888,8 +4894,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-examples.pod:35
 msgid ""
-"L<guestfs(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)"
-">, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
@@ -4960,15 +4966,15 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:32
 msgid ""
 "The links below explain how to use L<guestfish(1)> to change the background "
-"image for a user of a Windows XP VM.  Unfortunately the technique appears to "
-"be substantially different for each version of Windows."
+"image for a user of a Windows XP VM.  Unfortunately the technique appears to"
+" be substantially different for each version of Windows."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:37
 msgid ""
-"https://lists.fedoraproject.org/pipermail/virt/2011-May/002655.html https://"
-"lists.fedoraproject.org/pipermail/virt/2011-May/002658.html"
+"https://lists.fedoraproject.org/pipermail/virt/2011-May/002655.html "
+"https://lists.fedoraproject.org/pipermail/virt/2011-May/002658.html"
 msgstr ""
 
 #. type: =head1
@@ -5013,15 +5019,15 @@ msgstr ""
 msgid ""
 "It is possible to do a \"sysprep\" using libguestfs alone, although not "
 "straightforward.  Currently there is code in the Aeolus Oz project which "
-"does this (using libguestfs).  As part of our review of the virt-clone tool, "
-"we may add sysprepping ability."
+"does this (using libguestfs).  As part of our review of the virt-clone tool,"
+" we may add sysprepping ability."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:60
 msgid ""
-"https://github.com/clalancette/oz https://www.redhat.com/archives/virt-tools-"
-"list/2011-May/msg00019.html"
+"https://github.com/clalancette/oz https://www.redhat.com/archives/virt-"
+"tools-list/2011-May/msg00019.html"
 msgstr ""
 
 #. type: =head1
@@ -5070,8 +5076,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:78
 msgid ""
-"https://rwmj.wordpress.com/2010/09/08/new-guestfish-n-options-in-1-5-9/"
-"#content"
+"https://rwmj.wordpress.com/2010/09/08/new-guestfish-n-options-"
+"in-1-5-9/#content"
 msgstr ""
 
 #. type: =head1
@@ -5235,8 +5241,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:153
 msgid ""
 "Although it sounds tempting, this is usually not a reliable way to get a "
-"backup from a running guest.  See the entry in the FAQ: http://libguestfs."
-"org/FAQ.html#backup"
+"backup from a running guest.  See the entry in the FAQ: "
+"http://libguestfs.org/FAQ.html#backup"
 msgstr ""
 
 #. type: =head1
@@ -5319,15 +5325,15 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:184
 msgid ""
-"https://rwmj.wordpress.com/2011/03/31/tip-code-for-getting-dhcp-address-from-"
-"a-virtual-machine-disk-image/#content"
+"https://rwmj.wordpress.com/2011/03/31/tip-code-for-getting-dhcp-address-"
+"from-a-virtual-machine-disk-image/#content"
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:186
 msgid ""
-"In the libguestfs source examples directory you will find the latest version "
-"of the C<virt-dhcp-address.c> program."
+"In the libguestfs source examples directory you will find the latest version"
+" of the C<virt-dhcp-address.c> program."
 msgstr ""
 
 #. type: =head1
@@ -5401,15 +5407,15 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:220
 msgid ""
-"https://rwmj.wordpress.com/2010/10/30/tip-use-augeas-to-get-the-default-boot-"
-"kernel-for-a-vm/#content"
+"https://rwmj.wordpress.com/2010/10/30/tip-use-augeas-to-get-the-default-"
+"boot-kernel-for-a-vm/#content"
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:222
 msgid ""
-"It uses Augeas, and the technique is generally applicable for many different "
-"tasks, such as:"
+"It uses Augeas, and the technique is generally applicable for many different"
+" tasks, such as:"
 msgstr ""
 
 #. type: textblock
@@ -5532,8 +5538,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:305
 msgid ""
 "If you want to run the script on disk images (instead of libvirt virtual "
-"machines), change C<-d \"$1\"> to C<-a \"$1\">.  See also L<virt-inspector(1)"
-">."
+"machines), change C<-d \"$1\"> to C<-a \"$1\">.  See also L<virt-"
+"inspector(1)>."
 msgstr ""
 
 #. type: =head1
@@ -5563,15 +5569,15 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:317
 msgid ""
 "The link below contains a script that can be used to list out the services "
-"from a Windows VM, and whether those services run at boot time or are loaded "
-"on demand."
+"from a Windows VM, and whether those services run at boot time or are loaded"
+" on demand."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:321
 msgid ""
-"https://rwmj.wordpress.com/2010/12/10/tip-list-services-in-a-windows-guest/"
-"#content"
+"https://rwmj.wordpress.com/2010/12/10/tip-list-services-in-a-windows-"
+"guest/#content"
 msgstr ""
 
 #. type: =head1
@@ -5589,7 +5595,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:328
 msgid ""
-"https://rwmj.wordpress.com/2010/10/19/tip-making-a-disk-image-sparse/#content"
+"https://rwmj.wordpress.com/2010/10/19/tip-making-a-disk-image-"
+"sparse/#content"
 msgstr ""
 
 #. type: =head1
@@ -5729,9 +5736,9 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:386
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)"
-">, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-"
-"python(3)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<guestfs-examples(3)>, L<guestfs-"
+"erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L"
+"<guestfs-python(3)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -5775,16 +5782,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:22
 msgid ""
 "If you just want to add an ISO file (often you use this as an efficient way "
-"to transfer large files into the guest), then you should probably use L</add-"
-"drive-ro> instead."
+"to transfer large files into the guest), then you should probably use L"
+"</add-drive-ro> instead."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:214
 #: ../fish/guestfish-actions.pod:228
 msgid ""
-"I<This function is deprecated.> In new code, use the L</add_drive_opts> call "
-"instead."
+"I<This function is deprecated.> In new code, use the L</add_drive_opts> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -5833,9 +5840,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:41
 msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling L</add-drive-opts> on each one."
+"This function adds the disk(s) attached to the named libvirt domain C<dom>."
+"  It works by connecting to libvirt, requesting the domain and domain XML "
+"from libvirt, parsing it for disks, and calling L</add-drive-opts> on each "
+"one."
 msgstr ""
 
 #. type: textblock
@@ -5856,18 +5864,18 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:53 ../src/guestfs-actions.pod:72
 msgid ""
-"Disks must be accessible locally.  This often means that adding disks from a "
-"remote libvirt connection (see L<http://libvirt.org/remote.html>)  will fail "
-"unless those disks are accessible via the same device path locally too."
+"Disks must be accessible locally.  This often means that adding disks from a"
+" remote libvirt connection (see L<http://libvirt.org/remote.html>)  will "
+"fail unless those disks are accessible via the same device path locally too."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:58 ../src/guestfs-actions.pod:77
 msgid ""
-"The optional C<libvirturi> parameter sets the libvirt URI (see L<http://"
-"libvirt.org/uri.html>).  If this is not set then we connect to the default "
-"libvirt URI (or one set through an environment variable, see the libvirt "
-"documentation for full details)."
+"The optional C<libvirturi> parameter sets the libvirt URI (see "
+"L<http://libvirt.org/uri.html>).  If this is not set then we connect to the "
+"default libvirt URI (or one set through an environment variable, see the "
+"libvirt documentation for full details)."
 msgstr ""
 
 #. type: textblock
@@ -5876,8 +5884,8 @@ msgid ""
 "The optional C<live> flag controls whether this call will try to connect to "
 "a running virtual machine C<guestfsd> process if it sees a suitable "
 "E<lt>channelE<gt> element in the libvirt XML definition.  The default (if "
-"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING "
-"DAEMONS> for more information."
+"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING"
+" DAEMONS> for more information."
 msgstr ""
 
 #. type: textblock
@@ -5885,8 +5893,8 @@ msgstr ""
 msgid ""
 "If the C<allowuuid> flag is true (default is false) then a UUID I<may> be "
 "passed instead of the domain name.  The C<dom> string is treated as a UUID "
-"first and looked up, and if that lookup fails then we treat C<dom> as a name "
-"as usual."
+"first and looked up, and if that lookup fails then we treat C<dom> as a name"
+" as usual."
 msgstr ""
 
 #. type: textblock
@@ -5911,8 +5919,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:86 ../src/guestfs-actions.pod:105
 msgid ""
-"The whole call is aborted with an error if any disk with the E<lt>readonly/"
-"E<gt> flag is found."
+"The whole call is aborted with an error if any disk with the "
+"E<lt>readonly/E<gt> flag is found."
 msgstr ""
 
 #. type: textblock
@@ -5982,7 +5990,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3342 ../fish/guestfish-actions.pod:3505
 #: ../fish/guestfish-actions.pod:3640
 msgid ""
-"This command has one or more optional arguments.  See L</OPTIONAL ARGUMENTS>."
+"This command has one or more optional arguments.  See L</OPTIONAL "
+"ARGUMENTS>."
 msgstr ""
 
 #. type: =head2
@@ -6012,8 +6021,8 @@ msgid ""
 "Automatic detection of the format opens you up to a potential security hole "
 "when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
 "RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
-"you should think about replacing calls to this function with calls to L</add-"
-"drive-opts>, and specifying the format."
+"you should think about replacing calls to this function with calls to L"
+"</add-drive-opts>, and specifying the format."
 msgstr ""
 
 #. type: =head2
@@ -6046,9 +6055,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:153 ../src/guestfs-actions.pod:213
 msgid ""
 "You don't necessarily need to be root when using libguestfs.  However you "
-"obviously do need sufficient permissions to access the filename for whatever "
-"operations you want to perform (ie. read access if you just want to read the "
-"image or write access if you want to modify the image)."
+"obviously do need sufficient permissions to access the filename for whatever"
+" operations you want to perform (ie. read access if you just want to read "
+"the image or write access if you want to modify the image)."
 msgstr ""
 
 #. type: textblock
@@ -6083,9 +6092,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:173
 msgid ""
-"This forces the image format.  If you omit this (or use L</add-drive> or L</"
-"add-drive-ro>) then the format is automatically detected.  Possible formats "
-"include C<raw> and C<qcow2>."
+"This forces the image format.  If you omit this (or use L</add-drive> or L"
+"</add-drive-ro>) then the format is automatically detected.  Possible "
+"formats include C<raw> and C<qcow2>."
 msgstr ""
 
 #. type: textblock
@@ -6104,8 +6113,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:184
 msgid ""
-"This rarely-used option lets you emulate the behaviour of the deprecated L</"
-"add-drive-with-if> call (q.v.)"
+"This rarely-used option lets you emulate the behaviour of the deprecated L"
+"</add-drive-with-if> call (q.v.)"
 msgstr ""
 
 #. type: =item
@@ -6116,8 +6125,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:189 ../src/guestfs-actions.pod:249
 msgid ""
-"The name the drive had in the original guest, e.g. /dev/sdb. This is used as "
-"a hint to the guest inspection process if it is available."
+"The name the drive had in the original guest, e.g. /dev/sdb. This is used as"
+" a hint to the guest inspection process if it is available."
 msgstr ""
 
 #. type: =head2
@@ -6222,8 +6231,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:246
 msgid ""
-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call L</aug-init> again before you can use any "
+"Close the current Augeas handle and free up any resources used by it.  After"
+" calling this, you have to call L</aug-init> again before you can use any "
 "other Augeas functions."
 msgstr ""
 
@@ -6382,9 +6391,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:317
 msgid ""
-"This option is only useful when debugging Augeas lenses.  Use of this option "
-"may require additional memory for the libguestfs appliance.  You may need to "
-"set the C<LIBGUESTFS_MEMSIZE> environment variable or call L</set-memsize>."
+"This option is only useful when debugging Augeas lenses.  Use of this option"
+" may require additional memory for the libguestfs appliance.  You may need "
+"to set the C<LIBGUESTFS_MEMSIZE> environment variable or call L</set-"
+"memsize>."
 msgstr ""
 
 #. type: =item
@@ -6443,8 +6453,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:344 ../src/guestfs-actions.pod:492
 msgid ""
-"Create a new sibling C<label> for C<path>, inserting it into the tree before "
-"or after C<path> (depending on the boolean flag C<before>)."
+"Create a new sibling C<label> for C<path>, inserting it into the tree before"
+" or after C<path> (depending on the boolean flag C<before>)."
 msgstr ""
 
 #. type: textblock
@@ -6644,9 +6654,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:424 ../src/guestfs-actions.pod:624
 msgid ""
-"The argument C<groups> is a list of group names, eg: C<[\"inotify\", \"augeas"
-"\"]> would check for the availability of the Linux inotify functions and "
-"Augeas (configuration file editing) functions."
+"The argument C<groups> is a list of group names, eg: C<[\"inotify\", "
+"\"augeas\"]> would check for the availability of the Linux inotify functions"
+" and Augeas (configuration file editing) functions."
 msgstr ""
 
 #. type: textblock
@@ -6657,8 +6667,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:431 ../src/guestfs-actions.pod:631
 msgid ""
-"It fails with an error if one or more of the requested groups is unavailable "
-"in the appliance."
+"It fails with an error if one or more of the requested groups is unavailable"
+" in the appliance."
 msgstr ""
 
 #. type: textblock
@@ -6727,8 +6737,8 @@ msgstr ""
 msgid ""
 "This command returns a list of all optional groups that this daemon knows "
 "about.  Note this returns both supported and unsupported groups.  To find "
-"out which ones the daemon can actually support you have to call L</"
-"available> on each member of the returned list."
+"out which ones the daemon can actually support you have to call "
+"L</available> on each member of the returned list."
 msgstr ""
 
 #. type: textblock
@@ -6905,8 +6915,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:545 ../src/guestfs-actions.pod:792
 msgid ""
-"This returns the size of sectors on a block device.  Usually 512, but can be "
-"larger for modern devices."
+"This returns the size of sectors on a block device.  Usually 512, but can be"
+" larger for modern devices."
 msgstr ""
 
 #. type: textblock
@@ -6938,8 +6948,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:560
 msgid ""
-"See also L</blockdev-getss> for the real sector size of the device, and L</"
-"blockdev-getsize64> for the more useful I<size in bytes>."
+"See also L</blockdev-getss> for the real sector size of the device, and L"
+"</blockdev-getsize64> for the more useful I<size in bytes>."
 msgstr ""
 
 #. type: =head2
@@ -7106,23 +7116,23 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:646 ../src/guestfs-actions.pod:964
 msgid ""
-"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-faq/"
-"#posixfilenames1>"
+"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-"
+"faq/#posixfilenames1>"
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:649 ../src/guestfs-actions.pod:967
 msgid ""
-"This function resolves the true case of each element in the path and returns "
-"the case-sensitive path."
+"This function resolves the true case of each element in the path and returns"
+" the case-sensitive path."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:652
 msgid ""
-"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return C<\"/"
-"WINDOWS/system32\"> (the exact return value would depend on details of how "
-"the directories were originally created under Windows)."
+"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return "
+"C<\"/WINDOWS/system32\"> (the exact return value would depend on details of "
+"how the directories were originally created under Windows)."
 msgstr ""
 
 #. type: textblock
@@ -7159,8 +7169,8 @@ msgstr ""
 msgid ""
 "Note that this function cannot correctly handle binary files (specifically, "
 "files containing C<\\0> character which is treated as end of string).  For "
-"those you need to use the L</read-file> or L</download> functions which have "
-"a more complex interface."
+"those you need to use the L</read-file> or L</download> functions which have"
+" a more complex interface."
 msgstr ""
 
 #. type: textblock
@@ -7331,8 +7341,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:729
 msgid ""
 "This call computes the MD5, SHAx or CRC checksum of the contents of the "
-"device named C<device>.  For the types of checksums supported see the L</"
-"checksum> command."
+"device named C<device>.  For the types of checksums supported see the "
+"L</checksum> command."
 msgstr ""
 
 #. type: =head2
@@ -7351,16 +7361,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:737 ../src/guestfs-actions.pod:1087
 msgid ""
-"This command computes the checksums of all regular files in C<directory> and "
-"then emits a list of those checksums to the local output file C<sumsfile>."
+"This command computes the checksums of all regular files in C<directory> and"
+" then emits a list of those checksums to the local output file C<sumsfile>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:741 ../src/guestfs-actions.pod:1091
 msgid ""
 "This can be used for verifying the integrity of a virtual machine.  However "
-"to be properly secure you should pay attention to the output of the checksum "
-"command (it uses the ones from GNU coreutils).  In particular when the "
+"to be properly secure you should pay attention to the output of the checksum"
+" command (it uses the ones from GNU coreutils).  In particular when the "
 "filename is not printable, coreutils uses a special backslash syntax.  For "
 "more information, see the GNU coreutils info file."
 msgstr ""
@@ -7381,15 +7391,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:755 ../src/guestfs-actions.pod:1110
 msgid ""
-"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are "
-"supported."
+"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are"
+" supported."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:758 ../src/guestfs-actions.pod:1113
 msgid ""
-"I<Note>: When using this command from guestfish, C<mode> by default would be "
-"decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
+"I<Note>: When using this command from guestfish, C<mode> by default would be"
+" decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
 "C<700>."
 msgstr ""
 
@@ -7454,8 +7464,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:783
 msgid ""
 "The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
+"is the name of the program to run.  Subsequent elements are parameters.  The"
+" list must be non-empty (ie. must contain a program name).  Note that the "
 "command runs directly, and is I<not> invoked via the shell (see L</sh>)."
 msgstr ""
 
@@ -7467,24 +7477,24 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:793 ../src/guestfs-actions.pod:1162
 msgid ""
-"If the command returns a non-zero exit status, then this function returns an "
-"error message.  The error message string is the content of I<stderr> from "
+"If the command returns a non-zero exit status, then this function returns an"
+" error message.  The error message string is the content of I<stderr> from "
 "the command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:797 ../src/guestfs-actions.pod:1166
 msgid ""
-"The C<$PATH> environment variable will contain at least C</usr/bin> and C</"
-"bin>.  If you require a program from another location, you should provide "
-"the full path in the first parameter."
+"The C<$PATH> environment variable will contain at least C</usr/bin> and "
+"C</bin>.  If you require a program from another location, you should provide"
+" the full path in the first parameter."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:802 ../src/guestfs-actions.pod:1171
 msgid ""
-"Shared libraries and data files required by the program must be available on "
-"filesystems which are mounted in the correct places.  It is the caller's "
+"Shared libraries and data files required by the program must be available on"
+" filesystems which are mounted in the correct places.  It is the caller's "
 "responsibility to ensure all filesystems that are needed are mounted at the "
 "right locations."
 msgstr ""
@@ -7536,8 +7546,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:830
 msgid ""
-"The C<ctype> and optional C<level> parameters have the same meaning as in L</"
-"compress-out>."
+"The C<ctype> and optional C<level> parameters have the same meaning as in L"
+"</compress-out>."
 msgstr ""
 
 #. type: =head2
@@ -7556,7 +7566,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:841 ../src/guestfs-actions.pod:1273
 msgid ""
-"This command compresses C<file> and writes it out to the local file C<zfile>."
+"This command compresses C<file> and writes it out to the local file "
+"C<zfile>."
 msgstr ""
 
 #. type: textblock
@@ -7572,8 +7583,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:850 ../src/guestfs-actions.pod:1282
 msgid ""
-"The optional C<level> parameter controls compression level.  The meaning and "
-"default for this parameter depends on the compression program being used."
+"The optional C<level> parameter controls compression level.  The meaning and"
+" default for this parameter depends on the compression program being used."
 msgstr ""
 
 #. type: =head2
@@ -7632,8 +7643,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:882 ../src/guestfs-actions.pod:1360
 msgid ""
 "Partial copies can be made since you can specify optionally the source "
-"offset, destination offset and size to copy.  These values are all specified "
-"in bytes.  If not given, the offsets both default to zero, and the size "
+"offset, destination offset and size to copy.  These values are all specified"
+" in bytes.  If not given, the offsets both default to zero, and the size "
 "defaults to copying as much as possible until we hit the end of the source."
 msgstr ""
 
@@ -7647,8 +7658,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:891 ../src/guestfs-actions.pod:1369
 msgid ""
-"If the destination is a file, it is created if required.  If the destination "
-"file is not large enough, it is extended."
+"If the destination is a file, it is created if required.  If the destination"
+" file is not large enough, it is extended."
 msgstr ""
 
 #. type: =head2
@@ -7699,8 +7710,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:921
 msgid ""
-"This is B<not> the function you want for copying files.  This is for copying "
-"blocks within existing files.  See L</cp>, L</cp-a> and L</mv> for general "
+"This is B<not> the function you want for copying files.  This is for copying"
+" blocks within existing files.  See L</cp>, L</cp-a> and L</mv> for general "
 "file copying and moving functions."
 msgstr ""
 
@@ -7734,8 +7745,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:938 ../fish/guestfish-actions.pod:973
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"copy_device_to_device> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</copy_device_to_device> call instead."
 msgstr ""
 
 #. type: =head2
@@ -7774,8 +7785,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:956 ../src/guestfs-actions.pod:1612
 msgid ""
-"This copies a file or directory from C<src> to C<dest> recursively using the "
-"C<cp -a> command."
+"This copies a file or directory from C<src> to C<dest> recursively using the"
+" C<cp -a> command."
 msgstr ""
 
 #. type: =head2
@@ -7803,8 +7814,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:968
 msgid ""
 "If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see L</copy-device-to-device>)."
+"source file or device, otherwise the copy will fail.  This command cannot do"
+" partial copies (see L</copy-device-to-device>)."
 msgstr ""
 
 #. type: =head2
@@ -7876,8 +7887,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1009
 msgid ""
-"Another way to get the same information is to enable verbose messages with "
-"L</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
+"Another way to get the same information is to enable verbose messages with L"
+"</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
 "before running the program."
 msgstr ""
 
@@ -8030,8 +8041,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1078 ../src/guestfs-actions.pod:1804
 msgid ""
 "This runs C<e2fsck -p -f device>, ie. runs the ext2/ext3 filesystem checker "
-"on C<device>, noninteractively (I<-p>), even if the filesystem appears to be "
-"clean (I<-f>)."
+"on C<device>, noninteractively (I<-p>), even if the filesystem appears to be"
+" clean (I<-f>)."
 msgstr ""
 
 #. type: textblock
@@ -8150,8 +8161,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1129 ../src/guestfs-actions.pod:1893
 msgid ""
-"This returns C<true> if and only if there is a file, directory (or anything) "
-"with the given C<path> name."
+"This returns C<true> if and only if there is a file, directory (or anything)"
+" with the given C<path> name."
 msgstr ""
 
 #. type: textblock
@@ -8304,9 +8315,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1207 ../src/guestfs-actions.pod:2009
 msgid ""
-"The output depends on the output of the underlying L<file(1)> command and it "
-"can change in future in ways beyond our control.  In other words, the output "
-"is not guaranteed by the ABI."
+"The output depends on the output of the underlying L<file(1)> command and it"
+" can change in future in ways beyond our control.  In other words, the "
+"output is not guaranteed by the ABI."
 msgstr ""
 
 #. type: textblock
@@ -8539,16 +8550,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1333 ../src/guestfs-actions.pod:2157
 msgid ""
 "This command creates a new file called C<path>.  The initial content of the "
-"file is C<len> octets of C<c>, where C<c> must be a number in the range C<"
-"[0..255]>."
+"file is C<len> octets of C<c>, where C<c> must be a number in the range "
+"C<[0..255]>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1337
 msgid ""
 "To fill a file with zero bytes (sparsely), it is much more efficient to use "
-"L</truncate-size>.  To create a file with a pattern of repeating bytes use "
-"L</fill-pattern>."
+"L</truncate-size>.  To create a file with a pattern of repeating bytes use L"
+"</fill-pattern>."
 msgstr ""
 
 #. type: =head2
@@ -8568,9 +8579,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1346
 msgid ""
 "This function is like L</fill> except that it creates a new file of length "
-"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern "
-"is truncated if necessary to ensure the length of the file is exactly C<len> "
-"bytes."
+"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern"
+" is truncated if necessary to ensure the length of the file is exactly "
+"C<len> bytes."
 msgstr ""
 
 #. type: =head2
@@ -8598,8 +8609,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1360 ../src/guestfs-actions.pod:2208
 msgid ""
-"This returns a list of strings I<without any prefix>.  Thus if the directory "
-"structure was:"
+"This returns a list of strings I<without any prefix>.  Thus if the directory"
+" structure was:"
 msgstr ""
 
 #. type: verbatim
@@ -8630,7 +8641,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1375 ../src/guestfs-actions.pod:2223
-msgid "If C<directory> is not a directory, then this command returns an error."
+msgid ""
+"If C<directory> is not a directory, then this command returns an error."
 msgstr ""
 
 #. type: textblock
@@ -8777,8 +8789,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1460 ../src/guestfs-actions.pod:2336
 msgid ""
-"A non-zero return code can mean \"success\", for example if errors have been "
-"corrected on the filesystem."
+"A non-zero return code can mean \"success\", for example if errors have been"
+" corrected on the filesystem."
 msgstr ""
 
 #. type: textblock
@@ -8946,8 +8958,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1534
 msgid ""
 "If L</set-memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default"
+" value for memsize."
 msgstr ""
 
 #. type: textblock
@@ -9194,8 +9206,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1623
 msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling L</umask>."
+"Return the current umask.  By default the umask is C<022> unless it has been"
+" set by calling L</umask>."
 msgstr ""
 
 #. type: =head2
@@ -9264,8 +9276,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1649 ../fish/guestfish-actions.pod:2715
 msgid ""
 "Normally it is better to get all extended attributes from a file in one go "
-"by calling L</getxattrs>.  However some Linux filesystem implementations are "
-"buggy and do not provide a way to list out attributes.  For these "
+"by calling L</getxattrs>.  However some Linux filesystem implementations are"
+" buggy and do not provide a way to list out attributes.  For these "
 "filesystems (notably ntfs-3g)  you have to know the names of the extended "
 "attributes you want in advance and call this function."
 msgstr ""
@@ -9274,8 +9286,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1656 ../fish/guestfish-actions.pod:2722
 #: ../src/guestfs-actions.pod:2648 ../src/guestfs-actions.pod:4143
 msgid ""
-"Extended attribute values are blobs of binary data.  If there is no extended "
-"attribute named C<name>, this returns an error."
+"Extended attribute values are blobs of binary data.  If there is no extended"
+" attribute named C<name>, this returns an error."
 msgstr ""
 
 #. type: textblock
@@ -9330,8 +9342,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1677 ../src/guestfs-actions.pod:2685
 msgid ""
-"This command searches for all the pathnames matching C<pattern> according to "
-"the wildcard expansion rules used by the shell."
+"This command searches for all the pathnames matching C<pattern> according to"
+" the wildcard expansion rules used by the shell."
 msgstr ""
 
 #. type: textblock
@@ -9343,8 +9355,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1684 ../src/guestfs-actions.pod:2692
 msgid ""
-"It is just a wrapper around the C L<glob(3)> function with flags C<GLOB_MARK|"
-"GLOB_BRACE>.  See that manual page for more details."
+"It is just a wrapper around the C L<glob(3)> function with flags "
+"C<GLOB_MARK|GLOB_BRACE>.  See that manual page for more details."
 msgstr ""
 
 #. type: =head2
@@ -9362,7 +9374,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1692 ../src/guestfs-actions.pod:2709
-msgid "This calls the external C<grep> program and returns the matching lines."
+msgid ""
+"This calls the external C<grep> program and returns the matching lines."
 msgstr ""
 
 #. type: =head2
@@ -9407,8 +9420,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1721 ../src/guestfs-actions.pod:2756
 msgid ""
-"There is currently no way in the API to install grub2, which is used by most "
-"modern Linux guests.  It is possible to run the grub2 command from the "
+"There is currently no way in the API to install grub2, which is used by most"
+" modern Linux guests.  It is possible to run the grub2 command from the "
 "guest, although see the caveats in L<guestfs(3)/RUNNING COMMANDS>."
 msgstr ""
 
@@ -9424,10 +9437,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1735 ../src/guestfs-actions.pod:2770
 msgid ""
 "If grub-install reports the error \"No suitable drive was found in the "
-"generated device map.\" it may be that you need to create a C</boot/grub/"
-"device.map> file first that contains the mapping between grub device names "
-"and Linux device names.  It is usually sufficient to create a file "
-"containing:"
+"generated device map.\" it may be that you need to create a "
+"C</boot/grub/device.map> file first that contains the mapping between grub "
+"device names and Linux device names.  It is usually sufficient to create a "
+"file containing:"
 msgstr ""
 
 #. type: verbatim
@@ -9459,7 +9472,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1752 ../src/guestfs-actions.pod:2793
 msgid ""
-"This command returns up to the first 10 lines of a file as a list of strings."
+"This command returns up to the first 10 lines of a file as a list of "
+"strings."
 msgstr ""
 
 #. type: =head2
@@ -9539,8 +9553,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1791 ../src/guestfs-actions.pod:2858
 msgid ""
-"For example, in guestfish you could use the following command to examine the "
-"boot script (usually called C</init>)  contained in a Linux initrd or "
+"For example, in guestfish you could use the following command to examine the"
+" boot script (usually called C</init>)  contained in a Linux initrd or "
 "initramfs image:"
 msgstr ""
 
@@ -9639,9 +9653,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1834 ../src/guestfs-actions.pod:2923
 msgid ""
-"This closes the inotify handle which was previously opened by inotify_init.  "
-"It removes all watches, throws away any pending events, and deallocates all "
-"resources."
+"This closes the inotify handle which was previously opened by inotify_init."
+"  It removes all watches, throws away any pending events, and deallocates "
+"all resources."
 msgstr ""
 
 #. type: =head2
@@ -9688,11 +9702,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1854
 msgid ""
-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>, "
-"then the kernel (or previously set)  default is used.  For Linux 2.6.29 the "
-"default was 16384 events.  Beyond this limit, the kernel throws away events, "
-"but records the fact that it threw them away by setting a flag "
+"C<maxevents> is the maximum number of events which will be queued up between"
+" calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>,"
+" then the kernel (or previously set)  default is used.  For Linux 2.6.29 the"
+" default was 16384 events.  Beyond this limit, the kernel throws away "
+"events, but records the fact that it threw them away by setting a flag "
 "C<IN_Q_OVERFLOW> in the returned structure list (see L</inotify-read>)."
 msgstr ""
 
@@ -9700,16 +9714,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1864
 msgid ""
 "Before any events are generated, you have to add some watches to the "
-"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and "
-"L</inotify-watch-all>."
+"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and L"
+"</inotify-watch-all>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1870
 msgid ""
-"Queued up events should be read periodically by calling L</inotify-read> (or "
-"L</inotify-files> which is just a helpful wrapper around L</inotify-read>).  "
-"If you don't read the events out often enough then you risk the internal "
+"Queued up events should be read periodically by calling L</inotify-read> (or"
+" L</inotify-files> which is just a helpful wrapper around L</inotify-read>)."
+"  If you don't read the events out often enough then you risk the internal "
 "queue overflowing."
 msgstr ""
 
@@ -9756,10 +9770,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1895 ../src/guestfs-actions.pod:3002
 msgid ""
-"I<Note>: In order to make sure that all events have been read, you must call "
-"this function repeatedly until it returns an empty list.  The reason is that "
-"the call will read events up to the maximum appliance-to-host message size "
-"and leave remaining events in the queue."
+"I<Note>: In order to make sure that all events have been read, you must call"
+" this function repeatedly until it returns an empty list.  The reason is "
+"that the call will read events up to the maximum appliance-to-host message "
+"size and leave remaining events in the queue."
 msgstr ""
 
 #. type: =head2
@@ -10043,8 +10057,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2006 ../src/guestfs-actions.pod:3134
 msgid ""
-"Windows does not have distributions.  This string is returned if the OS type "
-"is Windows."
+"Windows does not have distributions.  This string is returned if the OS type"
+" is Windows."
 msgstr ""
 
 #. type: textblock
@@ -10073,8 +10087,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2020 ../src/guestfs-actions.pod:3155
 msgid ""
 "This call is useful for Windows which uses a primitive system of assigning "
-"drive letters (like \"C:\") to partitions.  This inspection API examines the "
-"Windows Registry to find out how disks/partitions are mapped to drive "
+"drive letters (like \"C:\") to partitions.  This inspection API examines the"
+" Windows Registry to find out how disks/partitions are mapped to drive "
 "letters, and returns a hash table as in the example below:"
 msgstr ""
 
@@ -10101,8 +10115,8 @@ msgstr ""
 msgid ""
 "In future we may support other operating systems that also used drive "
 "letters, but the keys for those might not be case insensitive and might be "
-"longer than 1 character.  For example in OS-9, hard drives were named C<h0>, "
-"C<h1> etc."
+"longer than 1 character.  For example in OS-9, hard drives were named C<h0>,"
+" C<h1> etc."
 msgstr ""
 
 #. type: textblock
@@ -10142,16 +10156,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2053 ../src/guestfs-actions.pod:3198
 msgid ""
-"This returns a list of all the filesystems that we think are associated with "
-"this operating system.  This includes the root filesystem, other ordinary "
+"This returns a list of all the filesystems that we think are associated with"
+" this operating system.  This includes the root filesystem, other ordinary "
 "filesystems, and non-mounted devices like swap partitions."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2058 ../src/guestfs-actions.pod:3203
 msgid ""
-"In the case of a multi-boot virtual machine, it is possible for a filesystem "
-"to be shared between operating systems."
+"In the case of a multi-boot virtual machine, it is possible for a filesystem"
+" to be shared between operating systems."
 msgstr ""
 
 #. type: textblock
@@ -10257,8 +10271,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2111 ../src/guestfs-actions.pod:3288
 msgid ""
 "This function returns an icon corresponding to the inspected operating "
-"system.  The icon is returned as a buffer containing a PNG image (re-encoded "
-"to PNG if necessary)."
+"system.  The icon is returned as a buffer containing a PNG image (re-encoded"
+" to PNG if necessary)."
 msgstr ""
 
 #. type: textblock
@@ -10289,15 +10303,15 @@ msgstr ""
 msgid ""
 "If the optional C<highquality> boolean is true then only high quality icons "
 "are returned, which means only icons of high resolution with an alpha "
-"channel.  The default (false) is to return any icon we can, even if it is of "
-"substandard quality."
+"channel.  The default (false) is to return any icon we can, even if it is of"
+" substandard quality."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2138 ../src/guestfs-actions.pod:3315
 msgid ""
-"Unlike most other inspection API calls, the guest's disks must be mounted up "
-"before you call this, since it needs to read information from the guest "
+"Unlike most other inspection API calls, the guest's disks must be mounted up"
+" before you call this, since it needs to read information from the guest "
 "filesystem during the call."
 msgstr ""
 
@@ -10306,15 +10320,15 @@ msgstr ""
 msgid ""
 "B<Security:> The icon data comes from the untrusted guest, and should be "
 "treated with caution.  PNG files have been known to contain exploits.  "
-"Ensure that libpng (or other relevant libraries) are fully up to date before "
-"trying to process or display the icon."
+"Ensure that libpng (or other relevant libraries) are fully up to date before"
+" trying to process or display the icon."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2152 ../src/guestfs-actions.pod:3329
 msgid ""
-"The PNG image returned can be any size.  It might not be square.  Libguestfs "
-"tries to return the largest, highest quality icon available.  The "
+"The PNG image returned can be any size.  It might not be square.  Libguestfs"
+" tries to return the largest, highest quality icon available.  The "
 "application must scale the icon to the required size."
 msgstr ""
 
@@ -10356,11 +10370,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2180 ../src/guestfs-actions.pod:3387
 msgid ""
-"Windows uses a consistent versioning scheme which is I<not> reflected in the "
-"popular public names used by the operating system.  Notably the operating "
+"Windows uses a consistent versioning scheme which is I<not> reflected in the"
+" popular public names used by the operating system.  Notably the operating "
 "system known as \"Windows 7\" is really version 6.1 (ie. major = 6, minor = "
-"1).  You can find out the real versions corresponding to releases of Windows "
-"by consulting Wikipedia or MSDN."
+"1).  You can find out the real versions corresponding to releases of Windows"
+" by consulting Wikipedia or MSDN."
 msgstr ""
 
 #. type: textblock
@@ -10413,10 +10427,10 @@ msgstr ""
 msgid ""
 "This returns a hash of where we think the filesystems associated with this "
 "operating system should be mounted.  Callers should note that this is at "
-"best an educated guess made by reading configuration files such as C</etc/"
-"fstab>.  I<In particular note> that this may return filesystems which are "
-"non-existent or not mountable and callers should be prepared to handle or "
-"ignore failures if they try to mount them."
+"best an educated guess made by reading configuration files such as "
+"C</etc/fstab>.  I<In particular note> that this may return filesystems which"
+" are non-existent or not mountable and callers should be prepared to handle "
+"or ignore failures if they try to mount them."
 msgstr ""
 
 #. type: textblock
@@ -10438,8 +10452,8 @@ msgstr ""
 msgid ""
 "For operating systems like Windows which still use drive letters, this call "
 "will only return an entry for the first drive \"mounted on\" C</>.  For "
-"information about the mapping of drive letters to partitions, see L</inspect-"
-"get-drive-mappings>."
+"information about the mapping of drive letters to partitions, see L"
+"</inspect-get-drive-mappings>."
 msgstr ""
 
 #. type: textblock
@@ -10512,8 +10526,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2263 ../src/guestfs-actions.pod:3499
 msgid ""
 "This returns the string C<unknown> if we could not determine the package "
-"management tool I<or> if the operating system does not have a real packaging "
-"system (eg. Windows)."
+"management tool I<or> if the operating system does not have a real packaging"
+" system (eg. Windows)."
 msgstr ""
 
 #. type: textblock
@@ -10541,8 +10555,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2278 ../src/guestfs-actions.pod:3521
 msgid ""
 "This returns the product name of the inspected operating system.  The "
-"product name is generally some freeform string which can be displayed to the "
-"user, but should not be parsed by programs."
+"product name is generally some freeform string which can be displayed to the"
+" user, but should not be parsed by programs."
 msgstr ""
 
 #. type: textblock
@@ -10573,11 +10587,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2295 ../src/guestfs-actions.pod:3545
 msgid ""
-"For Windows guests, this returns the contents of the Registry key C<HKLM"
-"\\Software\\Microsoft\\Windows NT\\CurrentVersion> C<InstallationType> which "
-"is usually a string such as C<Client> or C<Server> (other values are "
-"possible).  This can be used to distinguish consumer and enterprise versions "
-"of Windows that have the same version number (for example, Windows 7 and "
+"For Windows guests, this returns the contents of the Registry key "
+"C<HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion> C<InstallationType>"
+" which is usually a string such as C<Client> or C<Server> (other values are "
+"possible).  This can be used to distinguish consumer and enterprise versions"
+" of Windows that have the same version number (for example, Windows 7 and "
 "Windows 2008 Server are both version 6.1, but the former is C<Client> and "
 "the latter is C<Server>)."
 msgstr ""
@@ -10742,8 +10756,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2384 ../src/guestfs-actions.pod:3662
 msgid ""
-"This call assumes that the guest is Windows and that the systemroot could be "
-"determined by inspection.  If this is not the case then an error is returned."
+"This call assumes that the guest is Windows and that the systemroot could be"
+" determined by inspection.  If this is not the case then an error is "
+"returned."
 msgstr ""
 
 #. type: =head2
@@ -10829,9 +10844,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2428
 msgid ""
-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, "
-"then mount up the disks, before calling this.  Listing applications is a "
+"I<Note:> This call works differently from other parts of the inspection API."
+"  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, then "
+"mount up the disks, before calling this.  Listing applications is a "
 "significantly more difficult operation which requires access to the full "
 "filesystem.  Also note that unlike the other L</inspect-get-*> calls which "
 "are just returning data cached in the libguestfs handle, this call actually "
@@ -10877,8 +10892,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2455 ../src/guestfs-actions.pod:3758
 msgid ""
-"If unavailable this is returned as an empty string C<\"\">.  Callers needing "
-"to display something can use C<app_name> instead."
+"If unavailable this is returned as an empty string C<\"\">.  Callers needing"
+" to display something can use C<app_name> instead."
 msgstr ""
 
 #. type: =item
@@ -11037,25 +11052,25 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2528 ../src/guestfs-actions.pod:3838
 msgid ""
 "If one operating system was found, then this returns a list with a single "
-"element, which is the name of the root filesystem of this operating system.  "
-"It is also possible for this function to return a list containing more than "
-"one element, indicating a dual-boot or multi-boot virtual machine, with each "
-"element being the root filesystem of one of the operating systems."
+"element, which is the name of the root filesystem of this operating system."
+"  It is also possible for this function to return a list containing more "
+"than one element, indicating a dual-boot or multi-boot virtual machine, with"
+" each element being the root filesystem of one of the operating systems."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2535
 msgid ""
 "You can pass the root string(s) returned to other L</inspect-get-*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+"functions in order to query further information about each operating system,"
+" such as the name and version."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2540
 msgid ""
-"This function uses other libguestfs features such as L</mount-ro> and L</"
-"umount-all> in order to mount and unmount filesystems and look at the "
+"This function uses other libguestfs features such as L</mount-ro> and L"
+"</umount-all> in order to mount and unmount filesystems and look at the "
 "contents.  This should be called with no disks currently mounted.  The "
 "function may also use Augeas, so any existing Augeas handle will be closed."
 msgstr ""
@@ -11063,8 +11078,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2546 ../src/guestfs-actions.pod:3856
 msgid ""
-"This function cannot decrypt encrypted disks.  The caller must do that first "
-"(supplying the necessary keys) if the disk is encrypted."
+"This function cannot decrypt encrypted disks.  The caller must do that first"
+" (supplying the necessary keys) if the disk is encrypted."
 msgstr ""
 
 #. type: textblock
@@ -11218,7 +11233,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2613 ../src/guestfs-actions.pod:3965
 msgid ""
 "This returns C<true> if and only if there is a regular file with the given "
-"C<path> name.  Note that it returns false for other objects like directories."
+"C<path> name.  Note that it returns false for other objects like "
+"directories."
 msgstr ""
 
 #. type: =head2
@@ -11430,9 +11446,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2699
 msgid ""
-"Change the file owner to C<owner> and group to C<group>.  This is like L</"
-"chown> but if C<path> is a symlink then the link itself is changed, not the "
-"target."
+"Change the file owner to C<owner> and group to C<group>.  This is like "
+"L</chown> but if C<path> is a symlink then the link itself is changed, not "
+"the target."
 msgstr ""
 
 #. type: =head2
@@ -11451,8 +11467,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2711 ../src/guestfs-actions.pod:4132
 msgid ""
-"Get a single extended attribute from file C<path> named C<name>.  If C<path> "
-"is a symlink, then this call returns an extended attribute from the symlink."
+"Get a single extended attribute from file C<path> named C<name>.  If C<path>"
+" is a symlink, then this call returns an extended attribute from the "
+"symlink."
 msgstr ""
 
 #. type: textblock
@@ -11597,16 +11614,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2782 ../src/guestfs-actions.pod:4239
 msgid ""
-"The value can have the special value \"unknown\", meaning the content of the "
-"device is undetermined or empty.  \"swap\" means a Linux swap partition."
+"The value can have the special value \"unknown\", meaning the content of the"
+" device is undetermined or empty.  \"swap\" means a Linux swap partition."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2786
 msgid ""
 "This command runs other libguestfs commands, which might include L</mount> "
-"and L</umount>, and therefore you should use this soon after launch and only "
-"when nothing is mounted."
+"and L</umount>, and therefore you should use this soon after launch and only"
+" when nothing is mounted."
 msgstr ""
 
 #. type: textblock
@@ -11645,8 +11662,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2806
 msgid ""
-"This does not return logical volumes.  For that you will need to call L</"
-"lvs>."
+"This does not return logical volumes.  For that you will need to call "
+"L</lvs>."
 msgstr ""
 
 #. type: =head2
@@ -11768,8 +11785,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2851
 msgid ""
-"This is the same as L</removexattr>, but if C<path> is a symbolic link, then "
-"it removes an extended attribute of the link itself."
+"This is the same as L</removexattr>, but if C<path> is a symbolic link, then"
+" it removes an extended attribute of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -11789,7 +11806,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2859 ../src/guestfs-actions.pod:4375
 msgid ""
 "List the files in C<directory> (relative to the root directory, there is no "
-"cwd).  The '.' and '..' entries are not returned, but hidden files are shown."
+"cwd).  The '.' and '..' entries are not returned, but hidden files are "
+"shown."
 msgstr ""
 
 #. type: textblock
@@ -11815,8 +11833,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2870
 msgid ""
-"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it "
-"sets an extended attribute of the link itself."
+"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it"
+" sets an extended attribute of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -11841,8 +11859,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2880
 msgid ""
-"This is the same as L</stat> except that if C<path> is a symbolic link, then "
-"the link is stat-ed, not the file it refers to."
+"This is the same as L</stat> except that if C<path> is a symbolic link, then"
+" the link is stat-ed, not the file it refers to."
 msgstr ""
 
 #. type: textblock
@@ -11867,8 +11885,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2890
 msgid ""
 "This call allows you to perform the L</lstat> operation on multiple files, "
-"where all files are in the directory C<path>.  C<names> is the list of files "
-"from this directory."
+"where all files are in the directory C<path>.  C<names> is the list of files"
+" from this directory."
 msgstr ""
 
 #. type: textblock
@@ -11882,8 +11900,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2899
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lxattrlist> for a "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also L</lxattrlist> for a "
 "similarly efficient call for getting extended attributes.  Very long "
 "directory listings might cause the protocol message size to be exceeded, "
 "causing this call to fail.  The caller must split up such requests into "
@@ -11907,15 +11925,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2911 ../src/guestfs-actions.pod:4464
 msgid ""
 "This command adds a new key on LUKS device C<device>.  C<key> is any "
-"existing key, and is used to access the device.  C<newkey> is the new key to "
-"add.  C<keyslot> is the key slot that will be replaced."
+"existing key, and is used to access the device.  C<newkey> is the new key to"
+" add.  C<keyslot> is the key slot that will be replaced."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2916
 msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use L</luks-kill-slot> first to remove that key."
+"Note that if C<keyslot> already contains a key, then this command will fail."
+"  You have to use L</luks-kill-slot> first to remove that key."
 msgstr ""
 
 #. type: textblock
@@ -11943,10 +11961,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2927
 msgid ""
-"This closes a LUKS device that was created earlier by L</luks-open> or L</"
-"luks-open-ro>.  The C<device> parameter must be the name of the LUKS mapping "
-"device (ie. C</dev/mapper/mapname>) and I<not> the name of the underlying "
-"block device."
+"This closes a LUKS device that was created earlier by L</luks-open> or L"
+"</luks-open-ro>.  The C<device> parameter must be the name of the LUKS "
+"mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
+"underlying block device."
 msgstr ""
 
 #. type: =head2
@@ -11981,8 +11999,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:7028 ../src/guestfs-actions.pod:7058
 #: ../src/guestfs-actions.pod:7091 ../src/guestfs-actions.pod:8290
 msgid ""
-"B<This command is dangerous.  Without careful use you can easily destroy all "
-"your data>."
+"B<This command is dangerous.  Without careful use you can easily destroy all"
+" your data>."
 msgstr ""
 
 #. type: =head2
@@ -12093,7 +12111,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3002
 msgid ""
-"This is the same as L</luks-open> except that a read-only mapping is created."
+"This is the same as L</luks-open> except that a read-only mapping is "
+"created."
 msgstr ""
 
 #. type: =head2
@@ -12133,15 +12152,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3019 ../src/guestfs-actions.pod:4639
 msgid ""
 "This converts alternative naming schemes for LVs that you might find to the "
-"canonical name.  For example, C</dev/mapper/VG-LV> is converted to C</dev/VG/"
-"LV>."
+"canonical name.  For example, C</dev/mapper/VG-LV> is converted to "
+"C</dev/VG/LV>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3023 ../src/guestfs-actions.pod:4643
 msgid ""
-"This command returns an error if the C<lvname> parameter does not refer to a "
-"logical volume."
+"This command returns an error if the C<lvname> parameter does not refer to a"
+" logical volume."
 msgstr ""
 
 #. type: textblock
@@ -12165,8 +12184,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3032
 msgid ""
-"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every "
-"block device."
+"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every"
+" block device."
 msgstr ""
 
 #. type: textblock
@@ -12212,8 +12231,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3052 ../src/guestfs-actions.pod:4689
 msgid ""
-"This sets the LVM device filter so that LVM will only be able to \"see\" the "
-"block devices in the list C<devices>, and will ignore all other attached "
+"This sets the LVM device filter so that LVM will only be able to \"see\" the"
+" block devices in the list C<devices>, and will ignore all other attached "
 "block devices."
 msgstr ""
 
@@ -12221,10 +12240,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3056 ../src/guestfs-actions.pod:4693
 msgid ""
 "Where disk image(s) contain duplicate PVs or VGs, this command is useful to "
-"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also "
-"there are two types of duplication possible: either cloned PVs/VGs which "
-"have identical UUIDs; or VGs that are not cloned but just happen to have the "
-"same name.  In normal operation you cannot create this situation, but you "
+"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also"
+" there are two types of duplication possible: either cloned PVs/VGs which "
+"have identical UUIDs; or VGs that are not cloned but just happen to have the"
+" same name.  In normal operation you cannot create this situation, but you "
 "can do it outside LVM, eg.  by cloning disk images or by bit twiddling "
 "inside the LVM metadata."
 msgstr ""
@@ -12264,8 +12283,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3082 ../src/guestfs-actions.pod:4725
 msgid ""
-"You can also remove all LVs in a volume group by specifying the VG name, C</"
-"dev/VG>."
+"You can also remove all LVs in a volume group by specifying the VG name, "
+"C</dev/VG>."
 msgstr ""
 
 #. type: =head2
@@ -12322,10 +12341,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3103 ../src/guestfs-actions.pod:4767
 msgid ""
-"This expands an existing logical volume C<lv> so that it fills C<pc>% of the "
-"remaining free space in the volume group.  Commonly you would call this with "
-"pc = 100 which expands the logical volume as much as possible, using all "
-"remaining free space in the volume group."
+"This expands an existing logical volume C<lv> so that it fills C<pc>% of the"
+" remaining free space in the volume group.  Commonly you would call this "
+"with pc = 100 which expands the logical volume as much as possible, using "
+"all remaining free space in the volume group."
 msgstr ""
 
 #. type: =head2
@@ -12344,15 +12363,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3113 ../src/guestfs-actions.pod:4782
 msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command."
+"List all the logical volumes detected.  This is the equivalent of the "
+"L<lvs(8)> command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3116 ../src/guestfs-actions.pod:4785
 msgid ""
-"This returns a list of the logical volume device names (eg. C</dev/"
-"VolGroup00/LogVol00>)."
+"This returns a list of the logical volume device names (eg. "
+"C</dev/VolGroup00/LogVol00>)."
 msgstr ""
 
 #. type: textblock
@@ -12376,8 +12395,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3125 ../src/guestfs-actions.pod:4801
 msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command.  The \"full\" version includes all fields."
+"List all the logical volumes detected.  This is the equivalent of the "
+"L<lvs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -12414,32 +12433,33 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3138 ../src/guestfs-actions.pod:4830
 msgid ""
-"This call allows you to get the extended attributes of multiple files, where "
-"all files are in the directory C<path>.  C<names> is the list of files from "
-"this directory."
+"This call allows you to get the extended attributes of multiple files, where"
+" all files are in the directory C<path>.  C<names> is the list of files from"
+" this directory."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3142 ../src/guestfs-actions.pod:4834
 msgid ""
 "On return you get a flat list of xattr structs which must be interpreted "
-"sequentially.  The first xattr struct always has a zero-length C<attrname>.  "
-"C<attrval> in this struct is zero-length to indicate there was an error "
+"sequentially.  The first xattr struct always has a zero-length C<attrname>."
+"  C<attrval> in this struct is zero-length to indicate there was an error "
 "doing C<lgetxattr> for this file, I<or> is a C string which is a decimal "
-"number (the number of following attributes for this file, which could be C<"
-"\"0\">).  Then after the first xattr struct are the zero or more attributes "
-"for the first named file.  This repeats for the second and subsequent files."
+"number (the number of following attributes for this file, which could be "
+"C<\"0\">).  Then after the first xattr struct are the zero or more "
+"attributes for the first named file.  This repeats for the second and "
+"subsequent files."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3152
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lstatlist> for a "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also L</lstatlist> for a "
 "similarly efficient call for getting standard stats.  Very long directory "
 "listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
+"call to fail.  The caller must split up such requests into smaller groups of"
+" names."
 msgstr ""
 
 #. type: =head2
@@ -12537,8 +12557,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3195 ../src/guestfs-actions.pod:4914
 msgid ""
-"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one "
-"being suitable for Windows filesystems."
+"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one"
+" being suitable for Windows filesystems."
 msgstr ""
 
 #. type: textblock
@@ -12548,7 +12568,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3201 ../src/guestfs-actions.pod:4920
-msgid "The temporary directory is created with mode 0700 and is owned by root."
+msgid ""
+"The temporary directory is created with mode 0700 and is owned by root."
 msgstr ""
 
 #. type: textblock
@@ -12579,8 +12600,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3213 ../src/guestfs-actions.pod:4942
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"C<journal>.  It is equivalent to the command:"
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" C<journal>.  It is equivalent to the command:"
 msgstr ""
 
 #. type: verbatim
@@ -12612,8 +12633,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3225 ../src/guestfs-actions.pod:4963
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal labeled C<label>."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" the journal labeled C<label>."
 msgstr ""
 
 #. type: textblock
@@ -12637,8 +12658,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:4981
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal with UUID C<uuid>."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" the journal with UUID C<uuid>."
 msgstr ""
 
 #. type: textblock
@@ -12662,8 +12683,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3243 ../src/guestfs-actions.pod:4997
 msgid ""
-"This creates an ext2 external journal on C<device>.  It is equivalent to the "
-"command:"
+"This creates an ext2 external journal on C<device>.  It is equivalent to the"
+" command:"
 msgstr ""
 
 #. type: verbatim
@@ -12689,7 +12710,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3252 ../src/guestfs-actions.pod:5014
-msgid "This creates an ext2 external journal on C<device> with label C<label>."
+msgid ""
+"This creates an ext2 external journal on C<device> with label C<label>."
 msgstr ""
 
 #. type: =head2
@@ -12844,8 +12866,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3327 ../src/guestfs-actions.pod:5137
 msgid ""
-"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem "
-"type."
+"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem"
+" type."
 msgstr ""
 
 #. type: =item
@@ -12888,15 +12910,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3348
 msgid ""
-"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used "
-"to create extra mountpoints before mounting the first filesystem."
+"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used"
+" to create extra mountpoints before mounting the first filesystem."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3352 ../src/guestfs-actions.pod:5190
 msgid ""
-"These calls are I<only> necessary in some very limited circumstances, mainly "
-"the case where you want to mount a mix of unrelated and/or read-only "
+"These calls are I<only> necessary in some very limited circumstances, mainly"
+" the case where you want to mount a mix of unrelated and/or read-only "
 "filesystems together."
 msgstr ""
 
@@ -12953,9 +12975,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3383
 msgid ""
-"Autosync [see L</set-autosync>, this is set by default on handles] can cause "
-"L</umount-all> to be called when the handle is closed which can also trigger "
-"these issues."
+"Autosync [see L</set-autosync>, this is set by default on handles] can cause"
+" L</umount-all> to be called when the handle is closed which can also "
+"trigger these issues."
 msgstr ""
 
 #. type: =head2
@@ -12974,7 +12996,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3391 ../src/guestfs-actions.pod:5238
 msgid ""
-"This call creates block or character special devices, or named pipes (FIFOs)."
+"This call creates block or character special devices, or named pipes "
+"(FIFOs)."
 msgstr ""
 
 #. type: textblock
@@ -13077,9 +13100,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3441 ../src/guestfs-actions.pod:5319
 msgid ""
-"Note that you cannot attach a swap label to a block device (eg. C</dev/"
-"sda>), just to a partition.  This appears to be a limitation of the kernel "
-"or swap tools."
+"Note that you cannot attach a swap label to a block device (eg. "
+"C</dev/sda>), just to a partition.  This appears to be a limitation of the "
+"kernel or swap tools."
 msgstr ""
 
 #. type: =head2
@@ -13166,8 +13189,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3473 ../src/guestfs-actions.pod:5377
 msgid ""
-"Mount a guest disk at a position in the filesystem.  Block devices are named "
-"C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
+"Mount a guest disk at a position in the filesystem.  Block devices are named"
+" C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
 "those block devices contain partitions, they will have the usual names (eg. "
 "C</dev/sda1>).  Also LVM C</dev/VG/LV>-style names can be used."
 msgstr ""
@@ -13176,15 +13199,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3479 ../src/guestfs-actions.pod:5383
 msgid ""
 "The rules are the same as for L<mount(2)>: A filesystem must first be "
-"mounted on C</> before others can be mounted.  Other filesystems can only be "
-"mounted on directories which already exist."
+"mounted on C</> before others can be mounted.  Other filesystems can only be"
+" mounted on directories which already exist."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3484 ../src/guestfs-actions.pod:5388
 msgid ""
-"The mounted filesystem is writable, if we have sufficient permissions on the "
-"underlying device."
+"The mounted filesystem is writable, if we have sufficient permissions on the"
+" underlying device."
 msgstr ""
 
 #. type: textblock
@@ -13289,8 +13312,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3531
 msgid ""
-"This is the same as the L</mount> command, but it mounts the filesystem with "
-"the read-only (I<-o ro>) flag."
+"This is the same as the L</mount> command, but it mounts the filesystem with"
+" the read-only (I<-o ro>) flag."
 msgstr ""
 
 #. type: =head2
@@ -13309,8 +13332,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3538
 msgid ""
-"This is the same as the L</mount> command, but it allows you to set both the "
-"mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
+"This is the same as the L</mount> command, but it allows you to set both the"
+" mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
 msgstr ""
 
 #. type: =head2
@@ -13350,8 +13373,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3554 ../src/guestfs-actions.pod:5540
 msgid ""
-"This returns the list of currently mounted filesystems.  It returns the list "
-"of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."
+"This returns the list of currently mounted filesystems.  It returns the list"
+" of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."
 msgstr ""
 
 #. type: textblock
@@ -13416,8 +13439,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3580 ../src/guestfs-actions.pod:5582
 msgid ""
-"The return value is an integer which C<0> if the operation would succeed, or "
-"some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."
+"The return value is an integer which C<0> if the operation would succeed, or"
+" some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."
 msgstr ""
 
 #. type: =head2
@@ -13444,8 +13467,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3591 ../src/guestfs-actions.pod:5606
 msgid ""
-"I<Note:> After the resize operation, the filesystem is marked as requiring a "
-"consistency check (for safety).  You have to boot into Windows to perform "
+"I<Note:> After the resize operation, the filesystem is marked as requiring a"
+" consistency check (for safety).  You have to boot into Windows to perform "
 "this check and clear this condition.  Furthermore, ntfsresize refuses to "
 "resize filesystems which have been marked in this way.  So in effect it is "
 "not possible to call ntfsresize multiple times on a single filesystem "
@@ -13503,8 +13526,8 @@ msgid ""
 "After the resize operation, the filesystem is always marked as requiring a "
 "consistency check (for safety).  You have to boot into Windows to perform "
 "this check and clear this condition.  If you I<don't> set the C<force> "
-"option then it is not possible to call L</ntfsresize-opts> multiple times on "
-"a single filesystem without booting into Windows between each resize."
+"option then it is not possible to call L</ntfsresize-opts> multiple times on"
+" a single filesystem without booting into Windows between each resize."
 msgstr ""
 
 #. type: =head2
@@ -13550,8 +13573,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3663 ../src/guestfs-actions.pod:5722
 msgid ""
-"The C<prlogex> parameter is the type of partition.  Normally you should pass "
-"C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
+"The C<prlogex> parameter is the type of partition.  Normally you should pass"
+" C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
 "C<logical>) and C<e> (or C<extended>) partition types."
 msgstr ""
 
@@ -13566,8 +13589,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3672
 msgid ""
-"Creating a partition which covers the whole disk is not so easy.  Use L</"
-"part-disk> to do that."
+"Creating a partition which covers the whole disk is not so easy.  Use L"
+"</part-disk> to do that."
 msgstr ""
 
 #. type: =head2
@@ -13618,8 +13641,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3693
 msgid ""
-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in L</part-init>."
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other"
+" possible values are described in L</part-init>."
 msgstr ""
 
 #. type: =head2
@@ -13670,8 +13693,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3715 ../fish/guestfish-actions.pod:3859
 msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see L</part-get-"
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get"
+" undefined results for other partition table types (see L</part-get-"
 "parttype>)."
 msgstr ""
 
@@ -13720,8 +13743,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3735 ../src/guestfs-actions.pod:5836
 msgid ""
 "This creates an empty partition table on C<device> of one of the partition "
-"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt> "
-"(for large disks)."
+"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt>"
+" (for large disks)."
 msgstr ""
 
 #. type: textblock
@@ -13773,8 +13796,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3760 ../src/guestfs-actions.pod:5861
 msgid ""
 "The standard PC \"Master Boot Record\" (MBR) format used by MS-DOS and "
-"Windows.  This partition type will B<only> work for device sizes up to 2 "
-"TB.  For large disks we recommend using C<gpt>."
+"Windows.  This partition type will B<only> work for device sizes up to 2 TB."
+"  For large disks we recommend using C<gpt>."
 msgstr ""
 
 #. type: textblock
@@ -13884,8 +13907,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3812 ../src/guestfs-actions.pod:5919
 msgid ""
-"This command parses the partition table on C<device> and returns the list of "
-"partitions found."
+"This command parses the partition table on C<device> and returns the list of"
+" partitions found."
 msgstr ""
 
 #. type: textblock
@@ -13979,8 +14002,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3853 ../src/guestfs-actions.pod:5978
 msgid ""
-"Sets the MBR type byte (also known as the ID byte) of the numbered partition "
-"C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
+"Sets the MBR type byte (also known as the ID byte) of the numbered partition"
+" C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
 "documentation are in fact hexadecimal numbers, but usually documented "
 "without any leading \"0x\" which might be confusing."
 msgstr ""
@@ -14035,8 +14058,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3881 ../fish/guestfish-actions.pod:3893
 msgid ""
-"The named partition must exist, for example as a string returned from L</"
-"list-partitions>."
+"The named partition must exist, for example as a string returned from L"
+"</list-partitions>."
 msgstr ""
 
 #. type: textblock
@@ -14193,8 +14216,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3952 ../src/guestfs-actions.pod:6135
 msgid ""
 "The implementation uses the C<pvremove> command which refuses to wipe "
-"physical volumes that contain any volume groups, so you have to remove those "
-"first."
+"physical volumes that contain any volume groups, so you have to remove those"
+" first."
 msgstr ""
 
 #. type: =head2
@@ -14253,15 +14276,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3974 ../src/guestfs-actions.pod:6175
 msgid ""
-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command."
+"List all the physical volumes detected.  This is the equivalent of the "
+"L<pvs(8)> command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3977 ../src/guestfs-actions.pod:6178
 msgid ""
-"This returns a list of just the device names that contain PVs (eg. C</dev/"
-"sda2>)."
+"This returns a list of just the device names that contain PVs (eg. "
+"C</dev/sda2>)."
 msgstr ""
 
 #. type: textblock
@@ -14285,8 +14308,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3986 ../src/guestfs-actions.pod:6194
 msgid ""
-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command.  The \"full\" version includes all fields."
+"List all the physical volumes detected.  This is the equivalent of the "
+"L<pvs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -14323,8 +14346,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3999 ../src/guestfs-actions.pod:6225
 msgid ""
-"This command writes to part of a file.  It writes the data buffer C<content> "
-"to the file C<path> starting at offset C<offset>."
+"This command writes to part of a file.  It writes the data buffer C<content>"
+" to the file C<path> starting at offset C<offset>."
 msgstr ""
 
 #. type: textblock
@@ -14366,8 +14389,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4020 ../src/guestfs-actions.pod:6255
 msgid ""
 "This command implements the L<pwrite(2)> system call, and like that system "
-"call it may not write the full data requested (although short writes to disk "
-"devices and partitions are probably impossible with standard Linux kernels)."
+"call it may not write the full data requested (although short writes to disk"
+" devices and partitions are probably impossible with standard Linux "
+"kernels)."
 msgstr ""
 
 #. type: textblock
@@ -14604,8 +14628,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4131 ../src/guestfs-actions.pod:6405
 msgid ""
-"On return you get a list of strings, with a one-to-one correspondence to the "
-"C<names> list.  Each string is the value of the symbolic link."
+"On return you get a list of strings, with a one-to-one correspondence to the"
+" C<names> list.  Each string is the value of the symbolic link."
 msgstr ""
 
 #. type: textblock
@@ -14613,16 +14637,16 @@ msgstr ""
 msgid ""
 "If the C<readlink(2)> operation fails on any name, then the corresponding "
 "result string is the empty string C<\"\">.  However the whole operation is "
-"completed even if there were C<readlink(2)> errors, and so you can call this "
-"function with names where you don't know if they are symbolic links already "
-"(albeit slightly less efficient)."
+"completed even if there were C<readlink(2)> errors, and so you can call this"
+" function with names where you don't know if they are symbolic links already"
+" (albeit slightly less efficient)."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4142 ../src/guestfs-actions.pod:6416
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  Very long directory listings "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  Very long directory listings "
 "might cause the protocol message size to be exceeded, causing this call to "
 "fail.  The caller must split up such requests into smaller groups of names."
 msgstr ""
@@ -14694,10 +14718,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4172
 msgid ""
-"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device> "
-"before calling this command.  For unknown reasons C<resize2fs> sometimes "
-"gives an error about this and sometimes not.  In any case, it is always safe "
-"to call L</e2fsck-f> before calling this function."
+"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device>"
+" before calling this command.  For unknown reasons C<resize2fs> sometimes "
+"gives an error about this and sometimes not.  In any case, it is always safe"
+" to call L</e2fsck-f> before calling this function."
 msgstr ""
 
 #. type: =head2
@@ -14822,8 +14846,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4222
 msgid ""
-"This calls removes a mountpoint that was previously created with L</"
-"mkmountpoint>.  See L</mkmountpoint> for full details."
+"This calls removes a mountpoint that was previously created with "
+"L</mkmountpoint>.  See L</mkmountpoint> for full details."
 msgstr ""
 
 #. type: =head2
@@ -14896,8 +14920,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4255
 msgid ""
-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for L</scrub-file>, and "
+"This command creates the directory C<dir> and then fills it with files until"
+" the filesystem is full, and scrubs the files as for L</scrub-file>, and "
 "deletes them.  The intention is to scrub any free space on the partition "
 "containing C<dir>."
 msgstr ""
@@ -15064,7 +15088,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4333 ../src/guestfs-actions.pod:6700
-msgid "You probably don't want to use this unless you know what you are doing."
+msgid ""
+"You probably don't want to use this unless you know what you are doing."
 msgstr ""
 
 #. type: textblock
@@ -15187,8 +15212,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4387 ../src/guestfs-actions.pod:6776
 msgid ""
-"This affects whether commands are able to access the network (see L<guestfs"
-"(3)/RUNNING COMMANDS>)."
+"This affects whether commands are able to access the network (see "
+"L<guestfs(3)/RUNNING COMMANDS>)."
 msgstr ""
 
 #. type: textblock
@@ -15313,8 +15338,8 @@ msgid ""
 "Note that you should call this function as early as possible after creating "
 "the handle.  This is because some pre-launch operations depend on testing "
 "qemu features (by running C<qemu -help>).  If the qemu binary changes, we "
-"don't retest features, and so you might see inconsistent results.  Using the "
-"environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
+"don't retest features, and so you might see inconsistent results.  Using the"
+" environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
 "the qemu binary at the same time as the handle is created."
 msgstr ""
 
@@ -15413,8 +15438,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4486 ../src/guestfs-actions.pod:6899
 msgid ""
-"Change the number of virtual CPUs assigned to the appliance.  The default is "
-"C<1>.  Increasing this may improve performance, though often it has no "
+"Change the number of virtual CPUs assigned to the appliance.  The default is"
+" C<1>.  Increasing this may improve performance, though often it has no "
 "effect."
 msgstr ""
 
@@ -15444,8 +15469,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4498 ../src/guestfs-actions.pod:6915
 msgid ""
-"If the command trace flag is set to 1, then libguestfs calls, parameters and "
-"return values are traced."
+"If the command trace flag is set to 1, then libguestfs calls, parameters and"
+" return values are traced."
 msgstr ""
 
 #. type: textblock
@@ -15585,18 +15610,19 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4555 ../src/guestfs-actions.pod:7008
 msgid ""
 "C<cyls>, C<heads> and C<sectors> are the number of cylinders, heads and "
-"sectors on the device, which are passed directly to sfdisk as the I<-C>, I<-"
-"H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
-"corresponding parameter is omitted.  Usually for 'large' disks, you can just "
-"pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather, "
-"the kernel) cannot work out the right geometry and you will need to tell it."
+"sectors on the device, which are passed directly to sfdisk as the I<-C>, "
+"I<-H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
+"corresponding parameter is omitted.  Usually for 'large' disks, you can just"
+" pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather,"
+" the kernel) cannot work out the right geometry and you will need to tell "
+"it."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4563 ../src/guestfs-actions.pod:7016
 msgid ""
-"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information "
-"refer to the L<sfdisk(8)> manpage."
+"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information"
+" refer to the L<sfdisk(8)> manpage."
 msgstr ""
 
 #. type: textblock
@@ -15695,10 +15721,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4632
 msgid ""
-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see L</sfdisk-"
-"kernel-geometry>)."
+"This displays the disk geometry of C<device> read from the partition table."
+"  Especially in the case where the underlying block device has been resized,"
+" this can be different from the kernel's idea of the geometry (see L"
+"</sfdisk-kernel-geometry>)."
 msgstr ""
 
 #. type: textblock
@@ -15741,8 +15767,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4653 ../src/guestfs-actions.pod:7144
 msgid ""
-"This displays the partition table on C<device>, in the human-readable output "
-"of the L<sfdisk(8)> command.  It is not intended to be parsed."
+"This displays the partition table on C<device>, in the human-readable output"
+" of the L<sfdisk(8)> command.  It is not intended to be parsed."
 msgstr ""
 
 #. type: textblock
@@ -15773,8 +15799,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4670 ../src/guestfs-actions.pod:7161
 msgid ""
-"This call runs a command from the guest filesystem via the guest's C</bin/"
-"sh>."
+"This call runs a command from the guest filesystem via the guest's "
+"C</bin/sh>."
 msgstr ""
 
 #. type: textblock
@@ -15817,7 +15843,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4687
-msgid "This is the same as L</sh>, but splits the result into a list of lines."
+msgid ""
+"This is the same as L</sh>, but splits the result into a list of lines."
 msgstr ""
 
 #. type: textblock
@@ -15878,8 +15905,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4710 ../src/guestfs-actions.pod:7230
 msgid ""
 "Returns file system statistics for any mounted file system.  C<path> should "
-"be a file or directory in the mounted file system (typically it is the mount "
-"point itself, but it doesn't need to be)."
+"be a file or directory in the mounted file system (typically it is the mount"
+" point itself, but it doesn't need to be)."
 msgstr ""
 
 #. type: textblock
@@ -15923,8 +15950,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4730
 msgid ""
-"This is like the L</strings> command, but allows you to specify the encoding "
-"of strings that are looked for in the source file C<path>."
+"This is like the L</strings> command, but allows you to specify the encoding"
+" of strings that are looked for in the source file C<path>."
 msgstr ""
 
 #. type: textblock
@@ -15961,7 +15988,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4749 ../src/guestfs-actions.pod:7286
-msgid "16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
+msgid ""
+"16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
 msgstr ""
 
 #. type: =item
@@ -16075,8 +16103,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4797 ../src/guestfs-actions.pod:7360
 msgid ""
-"This command disables the libguestfs appliance swap partition with the given "
-"UUID."
+"This command disables the libguestfs appliance swap partition with the given"
+" UUID."
 msgstr ""
 
 #. type: =head2
@@ -16104,10 +16132,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4809 ../src/guestfs-actions.pod:7378
 msgid ""
 "Note that you should not swap to existing guest swap partitions unless you "
-"know what you are doing.  They may contain hibernation information, or other "
-"information that the guest doesn't want you to trash.  You also risk leaking "
-"information about the host to the guest this way.  Instead, attach a new "
-"host device to the guest and swap on that."
+"know what you are doing.  They may contain hibernation information, or other"
+" information that the guest doesn't want you to trash.  You also risk "
+"leaking information about the host to the guest this way.  Instead, attach a"
+" new host device to the guest and swap on that."
 msgstr ""
 
 #. type: =head2
@@ -16165,8 +16193,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4834
 msgid ""
-"This command enables swap to a swap partition with the given UUID.  See L</"
-"swapon-device> for other notes."
+"This command enables swap to a swap partition with the given UUID.  See L"
+"</swapon-device> for other notes."
 msgstr ""
 
 #. type: =head2
@@ -16308,8 +16336,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4900 ../src/guestfs-actions.pod:7526
 msgid ""
-"This command uploads and unpacks local file C<tarball> (a I<gzip compressed> "
-"tar file) into C<directory>."
+"This command uploads and unpacks local file C<tarball> (a I<gzip compressed>"
+" tar file) into C<directory>."
 msgstr ""
 
 #. type: textblock
@@ -16435,8 +16463,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4953 ../src/guestfs-actions.pod:7607
 msgid ""
-"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on "
-"C<device>."
+"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on"
+" C<device>."
 msgstr ""
 
 #. type: textblock
@@ -16444,8 +16472,8 @@ msgstr ""
 msgid ""
 "It is the same as running C<tune2fs -l device>.  See L<tune2fs(8)> manpage "
 "for more details.  The list of fields returned isn't clearly defined, and "
-"depends on both the version of C<tune2fs> that libguestfs was built against, "
-"and the filesystem itself."
+"depends on both the version of C<tune2fs> that libguestfs was built against,"
+" and the filesystem itself."
 msgstr ""
 
 #. type: =head2
@@ -16718,9 +16746,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:5084 ../src/guestfs-actions.pod:7801
 msgid ""
 "Note that because of dynamic linking this is not necessarily the version of "
-"libguestfs that you compiled against.  You can compile the program, and then "
-"at runtime dynamically link against a completely different C<libguestfs.so> "
-"library."
+"libguestfs that you compiled against.  You can compile the program, and then"
+" at runtime dynamically link against a completely different C<libguestfs.so>"
+" library."
 msgstr ""
 
 #. type: textblock
@@ -16735,8 +16763,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5095 ../src/guestfs-actions.pod:7812
 msgid ""
-"The call returns a structure with four elements.  The first three (C<major>, "
-"C<minor> and C<release>) are numbers and correspond to the usual version "
+"The call returns a structure with four elements.  The first three (C<major>,"
+" C<minor> and C<release>) are numbers and correspond to the usual version "
 "triplet.  The fourth element (C<extra>) is a string and is normally empty, "
 "but may be used for distro-specific information."
 msgstr ""
@@ -17044,8 +17072,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5217 ../src/guestfs-actions.pod:8011
 msgid ""
-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command."
+"List all the volumes groups detected.  This is the equivalent of the "
+"L<vgs(8)> command."
 msgstr ""
 
 #. type: textblock
@@ -17076,8 +17104,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5229 ../src/guestfs-actions.pod:8030
 msgid ""
-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command.  The \"full\" version includes all fields."
+"List all the volumes groups detected.  This is the equivalent of the "
+"L<vgs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -17154,7 +17182,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5256 ../src/guestfs-actions.pod:8110
 msgid ""
-"This command counts the lines in a file, using the C<wc -l> external command."
+"This command counts the lines in a file, using the C<wc -l> external "
+"command."
 msgstr ""
 
 #. type: =head2
@@ -17173,7 +17202,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5263 ../src/guestfs-actions.pod:8123
 msgid ""
-"This command counts the words in a file, using the C<wc -w> external command."
+"This command counts the words in a file, using the C<wc -w> external "
+"command."
 msgstr ""
 
 #. type: =head2
@@ -17360,8 +17390,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5356
 msgid ""
-"This command writes zeroes over the entire C<device>.  Compare with L</zero> "
-"which just zeroes the first few blocks of a device."
+"This command writes zeroes over the entire C<device>.  Compare with L</zero>"
+" which just zeroes the first few blocks of a device."
 msgstr ""
 
 #. type: =head2
@@ -17380,8 +17410,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5371 ../src/guestfs-actions.pod:8301
 msgid ""
-"This runs the I<zerofree> program on C<device>.  This program claims to zero "
-"unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
+"This runs the I<zerofree> program on C<device>.  This program claims to zero"
+" unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
 "possible to compress the filesystem more effectively."
 msgstr ""
 
@@ -17569,8 +17599,8 @@ msgstr ""
 msgid ""
 "C<copy-in> copies local files or directories recursively into the disk "
 "image, placing them in the directory called C</remotedir> (which must "
-"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and "
-"other commands as necessary."
+"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and"
+" other commands as necessary."
 msgstr ""
 
 #. type: textblock
@@ -17597,9 +17627,9 @@ msgstr ""
 #: ../fish/guestfish-commands.pod:34
 msgid ""
 "C<copy-out> copies remote files or directories recursively out of the disk "
-"image, placing them on the host disk in a local directory called C<localdir> "
-"(which must exist).  This guestfish meta-command turns into a sequence of L</"
-"download>, L</tar-out> and other commands as necessary."
+"image, placing them on the host disk in a local directory called C<localdir>"
+" (which must exist).  This guestfish meta-command turns into a sequence of "
+"L</download>, L</tar-out> and other commands as necessary."
 msgstr ""
 
 #. type: textblock
@@ -17801,7 +17831,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-commands.pod:116
 msgid ""
-"which would allow you to edit anywhere within the first megabyte of the disk."
+"which would allow you to edit anywhere within the first megabyte of the "
+"disk."
 msgstr ""
 
 #. type: textblock
@@ -17988,8 +18019,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-commands.pod:184
 msgid ""
-"This creates an empty sparse file of the given size, and then adds so it can "
-"be further examined."
+"This creates an empty sparse file of the given size, and then adds so it can"
+" be further examined."
 msgstr ""
 
 #. type: textblock
@@ -18019,7 +18050,8 @@ msgstr ""
 #: ../fish/guestfish-commands.pod:201
 msgid ""
 "This command returns a list of the optional groups known to the daemon, and "
-"indicates which ones are supported by this build of the libguestfs appliance."
+"indicates which ones are supported by this build of the libguestfs "
+"appliance."
 msgstr ""
 
 #. type: textblock
@@ -18130,9 +18162,9 @@ msgstr ""
 #: ../fish/guestfish.pod:25
 msgid ""
 "Using guestfish in read/write mode on live virtual machines can be "
-"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only) "
-"option to use guestfish safely if the disk image or virtual machine might be "
-"live."
+"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only)"
+" option to use guestfish safely if the disk image or virtual machine might "
+"be live."
 msgstr ""
 
 #. type: textblock
@@ -18302,7 +18334,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:109
 msgid ""
-"Use the I<-i> option to automatically mount the disks from a virtual machine:"
+"Use the I<-i> option to automatically mount the disks from a virtual "
+"machine:"
 msgstr ""
 
 #. type: verbatim
@@ -18673,8 +18706,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:296
 msgid ""
-"Fork into the background and listen for remote commands.  See section L</"
-"REMOTE CONTROL GUESTFISH OVER A SOCKET> below."
+"Fork into the background and listen for remote commands.  See section "
+"L</REMOTE CONTROL GUESTFISH OVER A SOCKET> below."
 msgstr ""
 
 #. type: =item
@@ -18685,8 +18718,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:179
 msgid ""
-"Connect to a live virtual machine.  (Experimental, see L<guestfs(3)/"
-"ATTACHING TO RUNNING DAEMONS>)."
+"Connect to a live virtual machine.  (Experimental, see "
+"L<guestfs(3)/ATTACHING TO RUNNING DAEMONS>)."
 msgstr ""
 
 #. type: =item
@@ -18724,21 +18757,21 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:317
 msgid ""
-"If you don't know what filesystems a disk image contains, you can either run "
-"guestfish without this option, then list the partitions, filesystems and LVs "
-"available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
+"If you don't know what filesystems a disk image contains, you can either run"
+" guestfish without this option, then list the partitions, filesystems and "
+"LVs available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
 "commands), or you can use the L<virt-filesystems(1)> program."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:192
 msgid ""
-"The third (and rarely used) part of the mount parameter is the list of mount "
-"options used to mount the underlying filesystem.  If this is not given, then "
-"the mount options are either the empty string or C<ro> (the latter if the "
-"I<--ro> flag is used).  By specifying the mount options, you override this "
-"default choice.  Probably the only time you would use this is to enable ACLs "
-"and/or extended attributes if the filesystem can support them:"
+"The third (and rarely used) part of the mount parameter is the list of mount"
+" options used to mount the underlying filesystem.  If this is not given, "
+"then the mount options are either the empty string or C<ro> (the latter if "
+"the I<--ro> flag is used).  By specifying the mount options, you override "
+"this default choice.  Probably the only time you would use this is to enable"
+" ACLs and/or extended attributes if the filesystem can support them:"
 msgstr ""
 
 #. type: verbatim
@@ -18790,8 +18823,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:348
 msgid ""
-"Prepare a fresh disk image formatted as \"type\".  This is an alternative to "
-"the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
+"Prepare a fresh disk image formatted as \"type\".  This is an alternative to"
+" the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
 "preformatted disk with a filesystem and adds it.  See L</PREPARED DISK "
 "IMAGES> below."
 msgstr ""
@@ -18857,8 +18890,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:376 ../rescue/virt-rescue.pod:167
 msgid ""
-"The option must always be used if the disk image or virtual machine might be "
-"running, and is generally recommended in cases where you don't need write "
+"The option must always be used if the disk image or virtual machine might be"
+" running, and is generally recommended in cases where you don't need write "
 "access to the disk."
 msgstr ""
 
@@ -18889,7 +18922,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:394
 msgid ""
-"Enable very verbose messages.  This is particularly useful if you find a bug."
+"Enable very verbose messages.  This is particularly useful if you find a "
+"bug."
 msgstr ""
 
 #. type: textblock
@@ -18963,9 +18997,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:432
 msgid ""
-"In either command line mode or non-interactive shell, the first command that "
-"gives an error causes the whole shell to exit.  In interactive mode (with a "
-"prompt) if a command fails, you can continue to enter commands."
+"In either command line mode or non-interactive shell, the first command that"
+" gives an error causes the whole shell to exit.  In interactive mode (with a"
+" prompt) if a command fails, you can continue to enter commands."
 msgstr ""
 
 #. type: =head1
@@ -18977,8 +19011,8 @@ msgstr ""
 #: ../fish/guestfish.pod:439
 msgid ""
 "As with L<guestfs(3)>, you must first configure your guest by adding disks, "
-"then launch it, then mount any disks you need, and finally issue actions/"
-"commands.  So the general order of the day is:"
+"then launch it, then mount any disks you need, and finally issue "
+"actions/commands.  So the general order of the day is:"
 msgstr ""
 
 #. type: textblock
@@ -19032,9 +19066,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:478
 msgid ""
-"In libguestfs E<le> 1.10, guestfish, guestmount and virt-rescue defaulted to "
-"opening disk images supplied on the command line for write.  To open a disk "
-"image read-only you have to do I<-a image --ro>."
+"In libguestfs E<le> 1.10, guestfish, guestmount and virt-rescue defaulted to"
+" opening disk images supplied on the command line for write.  To open a disk"
+" image read-only you have to do I<-a image --ro>."
 msgstr ""
 
 #. type: textblock
@@ -19059,16 +19093,16 @@ msgstr ""
 msgid ""
 "This version of guestfish, guestmount and virt-rescue has a I<--rw> option "
 "which does nothing (it is already the default).  However it is highly "
-"recommended that you use this option to indicate that you need write access, "
-"and prepare your scripts for the day when this option will be required for "
+"recommended that you use this option to indicate that you need write access,"
+" and prepare your scripts for the day when this option will be required for "
 "write access."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:498
 msgid ""
-"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any "
-"other libguestfs program apart from guestfish and guestmount."
+"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any"
+" other libguestfs program apart from guestfish and guestmount."
 msgstr ""
 
 #. type: =head1
@@ -19079,8 +19113,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:503
 msgid ""
-"You can quote ordinary parameters using either single or double quotes.  For "
-"example:"
+"You can quote ordinary parameters using either single or double quotes.  For"
+" example:"
 msgstr ""
 
 #. type: verbatim
@@ -19134,7 +19168,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:523
 msgid ""
-"In double-quoted arguments (only) use backslash to insert special characters:"
+"In double-quoted arguments (only) use backslash to insert special "
+"characters:"
 msgstr ""
 
 #. type: =item
@@ -19225,8 +19260,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:562
 msgid ""
-"A character with octal value I<ooo>.  There must be precisely 3 octal digits "
-"(unlike C)."
+"A character with octal value I<ooo>.  There must be precisely 3 octal digits"
+" (unlike C)."
 msgstr ""
 
 #. type: =item
@@ -19296,8 +19331,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:591
 msgid ""
-"Each optional argument can appear at most once.  All optional arguments must "
-"appear after the required ones."
+"Each optional argument can appear at most once.  All optional arguments must"
+" appear after the required ones."
 msgstr ""
 
 #. type: =head1
@@ -19319,8 +19354,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:601
 msgid ""
-"When the command takes a parameter measured in bytes, you can use one of the "
-"following suffixes to specify kilobytes, megabytes and larger sizes:"
+"When the command takes a parameter measured in bytes, you can use one of the"
+" following suffixes to specify kilobytes, megabytes and larger sizes:"
 msgstr ""
 
 #. type: =item
@@ -19559,8 +19594,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:705
 msgid ""
-"Neither guestfish nor the underlying guestfs API performs wildcard expansion "
-"(globbing) by default.  So for example the following will not do what you "
+"Neither guestfish nor the underlying guestfs API performs wildcard expansion"
+" (globbing) by default.  So for example the following will not do what you "
 "expect:"
 msgstr ""
 
@@ -19595,8 +19630,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:718
 msgid ""
-"runs C<rm-rf> on each path that matches (ie. potentially running the command "
-"many times), equivalent to:"
+"runs C<rm-rf> on each path that matches (ie. potentially running the command"
+" many times), equivalent to:"
 msgstr ""
 
 #. type: verbatim
@@ -19709,8 +19744,8 @@ msgstr ""
 #: ../fish/guestfish.pod:767
 msgid ""
 "For example it is tedious to create a sequence of files (eg. C</foo.1> "
-"through C</foo.100>) using guestfish commands alone.  However this is simple "
-"if we use a shell script to create the guestfish commands for us:"
+"through C</foo.100>) using guestfish commands alone.  However this is simple"
+" if we use a shell script to create the guestfish commands for us:"
 msgstr ""
 
 #. type: verbatim
@@ -19753,8 +19788,8 @@ msgstr ""
 #: ../fish/guestfish.pod:786
 msgid ""
 "Use C<command E<lt>spaceE<gt> | command> to pipe the output of the first "
-"command (a guestfish command) to the second command (any host command).  For "
-"example:"
+"command (a guestfish command) to the second command (any host command).  For"
+" example:"
 msgstr ""
 
 #. type: verbatim
@@ -19769,8 +19804,8 @@ msgstr ""
 #: ../fish/guestfish.pod:792
 msgid ""
 "(where C<cat> is the guestfish cat command, but C<awk> is the host awk "
-"program).  The above command would list all accounts in the guest filesystem "
-"which have UID 0, ie. root accounts including backdoors.  Other examples:"
+"program).  The above command would list all accounts in the guest filesystem"
+" which have UID 0, ie. root accounts including backdoors.  Other examples:"
 msgstr ""
 
 #. type: verbatim
@@ -19795,8 +19830,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:806
 msgid ""
-"To use a literal argument which begins with a pipe symbol, you have to quote "
-"it, eg:"
+"To use a literal argument which begins with a pipe symbol, you have to quote"
+" it, eg:"
 msgstr ""
 
 #. type: verbatim
@@ -19815,9 +19850,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:813
 msgid ""
-"If a parameter starts with the character C<~> then the tilde may be expanded "
-"as a home directory path (either C<~> for the current user's home directory, "
-"or C<~user> for another user)."
+"If a parameter starts with the character C<~> then the tilde may be expanded"
+" as a home directory path (either C<~> for the current user's home "
+"directory, or C<~user> for another user)."
 msgstr ""
 
 #. type: textblock
@@ -19911,8 +19946,8 @@ msgstr ""
 #: ../fish/guestfish.pod:851
 msgid ""
 "Before closing a LUKS device you must unmount any logical volumes on it and "
-"deactivate the volume groups by calling C<vg-activate false VG> on each "
-"one.  Then you can close the mapper device:"
+"deactivate the volume groups by calling C<vg-activate false VG> on each one."
+"  Then you can close the mapper device:"
 msgstr ""
 
 #. type: verbatim
@@ -19961,9 +19996,9 @@ msgstr ""
 msgid ""
 "The parameter is rewritten \"behind the scenes\" by looking up the position "
 "where the drive is mounted, prepending that to the path, changing all "
-"backslash characters to forward slash, then resolving the result using L</"
-"case-sensitive-path>.  For example if the E: drive was mounted on C</e> then "
-"the parameter might be rewritten like this:"
+"backslash characters to forward slash, then resolving the result using L"
+"</case-sensitive-path>.  For example if the E: drive was mounted on C</e> "
+"then the parameter might be rewritten like this:"
 msgstr ""
 
 #. type: verbatim
@@ -20044,9 +20079,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:906
 msgid ""
-"Any string of characters can be used instead of C<END>.  The end marker must "
-"appear on a line of its own, without any preceeding or following characters "
-"(not even spaces)."
+"Any string of characters can be used instead of C<END>.  The end marker must"
+" appear on a line of its own, without any preceeding or following characters"
+" (not even spaces)."
 msgstr ""
 
 #. type: textblock
@@ -20137,8 +20172,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:949
 msgid ""
-"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which "
-"is how the I<--remote> option knows where to send the commands.  You can "
+"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which"
+" is how the I<--remote> option knows where to send the commands.  You can "
 "have several guestfish listener processes running using:"
 msgstr ""
 
@@ -20184,9 +20219,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:970
 msgid ""
-"Remote control happens over a Unix domain socket called C</tmp/.guestfish-"
-"$UID/socket-$PID>, where C<$UID> is the effective user ID of the process, "
-"and C<$PID> is the process ID of the server."
+"Remote control happens over a Unix domain socket called "
+"C</tmp/.guestfish-$UID/socket-$PID>, where C<$UID> is the effective user ID "
+"of the process, and C<$PID> is the process ID of the server."
 msgstr ""
 
 #. type: textblock
@@ -20292,8 +20327,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1016
 msgid ""
 "Since the C<run> command produces no output on stdout, this is not useful "
-"anyway.  For further information see L<https://bugzilla.redhat.com/show_bug."
-"cgi?id=592910>."
+"anyway.  For further information see "
+"L<https://bugzilla.redhat.com/show_bug.cgi?id=592910>."
 msgstr ""
 
 #. type: =head1
@@ -20325,10 +20360,10 @@ msgid ""
 "The type briefly describes how the disk should be sized, partitioned, how "
 "filesystem(s) should be created, and how content should be added.  "
 "Optionally the type can be followed by extra parameters, separated by C<:> "
-"(colon) characters.  For example, I<-N fs> creates a default 100MB, sparsely-"
-"allocated disk, containing a single partition, with the partition formatted "
-"as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem on a 1GB "
-"disk instead."
+"(colon) characters.  For example, I<-N fs> creates a default 100MB, "
+"sparsely-allocated disk, containing a single partition, with the partition "
+"formatted as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem"
+" on a 1GB disk instead."
 msgstr ""
 
 #. type: textblock
@@ -20339,8 +20374,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1044
 msgid ""
-"Note that the prepared filesystem is not mounted.  You would usually have to "
-"use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
+"Note that the prepared filesystem is not mounted.  You would usually have to"
+" use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
 msgstr ""
 
 #. type: textblock
@@ -20405,8 +20440,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1071
 msgid ""
 "When a command that supports progress bars takes longer than two seconds to "
-"run, and if progress bars are enabled, then you will see one appearing below "
-"the command:"
+"run, and if progress bars are enabled, then you will see one appearing below"
+" the command:"
 msgstr ""
 
 #. type: verbatim
@@ -20433,8 +20468,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1085
 msgid ""
 "Progress bars are enabled by default when guestfish is used interactively.  "
-"You can enable them even for non-interactive modes using I<--progress-bars>, "
-"and you can disable them completely using I<--no-progress-bars>."
+"You can enable them even for non-interactive modes using I<--progress-bars>,"
+" and you can disable them completely using I<--no-progress-bars>."
 msgstr ""
 
 #. type: =head1
@@ -20530,8 +20565,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1132 ../src/guestfs.pod:3217
 msgid ""
-"These two environment variables allow the kernel that libguestfs uses in the "
-"appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not set, then the "
+"These two environment variables allow the kernel that libguestfs uses in the"
+" appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not set, then the "
 "most recent host kernel is chosen.  For more information about kernel "
 "selection, see L<febootstrap-supermin-helper(8)>.  This feature is only "
 "available in febootstrap E<ge> 3.8."
@@ -20646,8 +20681,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1183 ../src/guestfs.pod:3246
 msgid ""
-"Set the default qemu binary that libguestfs uses.  If not set, then the qemu "
-"which was found at compile time by the configure script is used."
+"Set the default qemu binary that libguestfs uses.  If not set, then the qemu"
+" which was found at compile time by the configure script is used."
 msgstr ""
 
 #. type: =item
@@ -20751,8 +20786,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1231
 msgid ""
 "If compiled with GNU readline support, then these files can be used to "
-"configure readline.  For further information, please see L<readline(3)/"
-"INITIALIZATION FILE>."
+"configure readline.  For further information, please see "
+"L<readline(3)/INITIALIZATION FILE>."
 msgstr ""
 
 #. type: textblock
@@ -20773,8 +20808,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1241
 msgid ""
-"Variables that you can set in inputrc that change the behaviour of guestfish "
-"in useful ways include:"
+"Variables that you can set in inputrc that change the behaviour of guestfish"
+" in useful ways include:"
 msgstr ""
 
 #. type: =item
@@ -20817,20 +20852,21 @@ msgstr ""
 msgid ""
 "When using the I<-N> or I<--new> option, the prepared disk or filesystem "
 "will be created in the file C<test1.img> in the current directory.  The "
-"second use of I<-N> will use C<test2.img> and so on.  Any existing file with "
-"the same name will be overwritten."
+"second use of I<-N> will use C<test2.img> and so on.  Any existing file with"
+" the same name will be overwritten."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:1270
 msgid ""
 "L<guestfs(3)>, L<http://libguestfs.org/>, L<virt-alignment-scan(1)>, L<virt-"
-"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit"
-"(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-filesystems"
-"(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-"
-"rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-sysprep(1)>, "
-"L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, "
-"L<display(1)>, L<hexedit(1)>, L<febootstrap-supermin-helper(8)>."
+"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-"
+"edit(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-"
+"filesystems(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-"
+"fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-"
+"sysprep(1)>, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-"
+"win-reg(1)>, L<display(1)>, L<hexedit(1)>, L<febootstrap-supermin-"
+"helper(8)>."
 msgstr ""
 
 #. type: textblock
@@ -20864,8 +20900,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:15
 msgid ""
-"Using C<virt-copy-in> on live virtual machines can be dangerous, potentially "
-"causing disk corruption.  The virtual machine must be shut down before you "
+"Using C<virt-copy-in> on live virtual machines can be dangerous, potentially"
+" causing disk corruption.  The virtual machine must be shut down before you "
 "use this command."
 msgstr ""
 
@@ -20915,9 +20951,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:41
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<copy-in> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<copy-in> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
@@ -20931,8 +20967,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:52
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, "
-"L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L"
+"<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -20995,16 +21031,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-out.pod:30
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<copy-out> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<copy-out> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-copy-out.pod:41
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-edit(1)>, L<virt-"
-"tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-edit(1)>, L"
+"<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21070,17 +21106,17 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-tar-in.pod:38
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<tar-in> command.  For anything more complex than a trivial copy, you are "
-"probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<tar-in> command.  For anything more complex than a trivial"
+" copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-tar-in.pod:49
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
-"L<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, L<http://libguestfs."
-"org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L"
+"<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21143,16 +21179,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-tar-out.pod:32
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<tar-out> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<tar-out> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-tar-out.pod:43
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
-"L<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L"
+"<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21205,8 +21241,8 @@ msgstr ""
 #: ../fuse/guestmount.pod:27
 msgid ""
 "Along with other options, you have to give at least one device (I<-a> "
-"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m> "
-"option) or use the I<-i> inspection option or the I<--live> option.  How "
+"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m>"
+" option) or use the I<-i> inspection option or the I<--live> option.  How "
 "this works is better explained in the L<guestfish(1)> manual page, or by "
 "looking at the examples below."
 msgstr ""
@@ -21215,9 +21251,9 @@ msgstr ""
 #: ../fuse/guestmount.pod:33
 msgid ""
 "FUSE lets you mount filesystems as non-root.  The mountpoint must be owned "
-"by you, and the filesystem will not be visible to any other users unless you "
-"make certain global configuration changes to C</etc/fuse.conf>.  To unmount "
-"the filesystem, use the C<fusermount -u> command."
+"by you, and the filesystem will not be visible to any other users unless you"
+" make certain global configuration changes to C</etc/fuse.conf>.  To unmount"
+" the filesystem, use the C<fusermount -u> command."
 msgstr ""
 
 #. type: textblock
@@ -21379,11 +21415,11 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:125
 msgid ""
-"Set the readdir cache timeout to I<N> seconds, the default being 60 "
-"seconds.  The readdir cache [actually, there are several semi-independent "
-"caches] is populated after a readdir(2) call with the stat and extended "
-"attributes of the files in the directory, in anticipation that they will be "
-"requested soon after."
+"Set the readdir cache timeout to I<N> seconds, the default being 60 seconds."
+"  The readdir cache [actually, there are several semi-independent caches] is"
+" populated after a readdir(2) call with the stat and extended attributes of "
+"the files in the directory, in anticipation that they will be requested soon"
+" after."
 msgstr ""
 
 #. type: textblock
@@ -21399,8 +21435,8 @@ msgstr ""
 msgid ""
 "If you have untrusted raw-format guest disk images, you should use this "
 "option to specify the disk format.  This avoids a possible security problem "
-"with malicious guests (CVE-2010-3851).  See also L<guestfs(3)/"
-"guestfs_add_drive_opts>."
+"with malicious guests (CVE-2010-3851).  See also "
+"L<guestfs(3)/guestfs_add_drive_opts>."
 msgstr ""
 
 #. type: =item
@@ -21421,8 +21457,8 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:186
 msgid ""
-"Mount the named partition or logical volume on the given mountpoint B<in the "
-"guest> (this has nothing to do with mountpoints in the host)."
+"Mount the named partition or logical volume on the given mountpoint B<in the"
+" guest> (this has nothing to do with mountpoints in the host)."
 msgstr ""
 
 #. type: textblock
@@ -21504,8 +21540,8 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:237
 msgid ""
-"Allow the kernel to cache files (reduces the number of reads that have to go "
-"through the L<guestfs(3)> API).  This is generally a good idea if you can "
+"Allow the kernel to cache files (reduces the number of reads that have to go"
+" through the L<guestfs(3)> API).  This is generally a good idea if you can "
 "afford the extra memory usage."
 msgstr ""
 
@@ -21581,9 +21617,9 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:319
 msgid ""
-"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
-"L<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, L<http://fuse.sf."
-"net/>."
+"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L"
+"<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, "
+"L<http://fuse.sf.net/>."
 msgstr ""
 
 #. type: textblock
@@ -21654,10 +21690,10 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:30
 msgid ""
 "You can also run virt-inspector directly on disk images from a single "
-"virtual machine.  Use C<virt-inspector -a disk.img>.  In rare cases a domain "
-"has several block devices, in which case you should list several I<-a> "
-"options one after another, with the first corresponding to the guest's C</"
-"dev/sda>, the second to the guest's C</dev/sdb> and so on."
+"virtual machine.  Use C<virt-inspector -a disk.img>.  In rare cases a domain"
+" has several block devices, in which case you should list several I<-a> "
+"options one after another, with the first corresponding to the guest's "
+"C</dev/sda>, the second to the guest's C</dev/sdb> and so on."
 msgstr ""
 
 #. type: textblock
@@ -21670,8 +21706,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:40
 msgid ""
-"Virt-inspector can only inspect and report upon I<one domain at a time>.  To "
-"inspect several virtual machines, you have to run virt-inspector several "
+"Virt-inspector can only inspect and report upon I<one domain at a time>.  To"
+" inspect several virtual machines, you have to run virt-inspector several "
 "times (for example, from a shell script for-loop)."
 msgstr ""
 
@@ -21759,8 +21795,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:155
 msgid ""
-"The virt-inspector XML is described precisely in a RELAX NG schema file "
-"C<virt-inspector.rng> which is supplied with libguestfs.  This section is "
+"The virt-inspector XML is described precisely in a RELAX NG schema file C"
+"<virt-inspector.rng> which is supplied with libguestfs.  This section is "
 "just an overview."
 msgstr ""
 
@@ -21809,8 +21845,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:183
 msgid ""
 "In brief, E<lt>nameE<gt> is the class of operating system (something like "
-"C<linux> or C<windows>), E<lt>distroE<gt> is the distribution (eg. C<fedora> "
-"but many other distros are recognized) and E<lt>archE<gt> is the guest "
+"C<linux> or C<windows>), E<lt>distroE<gt> is the distribution (eg. C<fedora>"
+" but many other distros are recognized) and E<lt>archE<gt> is the guest "
 "architecture.  The other fields are fairly self-explanatory, but because "
 "these fields are taken directly from the libguestfs inspection API you can "
 "find precise information from L<guestfs(3)/INSPECTION>."
@@ -21819,8 +21855,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:191
 msgid ""
-"The E<lt>rootE<gt> element is the root filesystem device, but from the point "
-"of view of libguestfs (block devices may have completely different names "
+"The E<lt>rootE<gt> element is the root filesystem device, but from the point"
+" of view of libguestfs (block devices may have completely different names "
 "inside the VM itself)."
 msgstr ""
 
@@ -21953,8 +21989,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:262
 msgid ""
 "The version and release fields may not be available for some types guests.  "
-"Other fields are possible, see L<guestfs(3)/"
-"guestfs_inspect_list_applications>."
+"Other fields are possible, see "
+"L<guestfs(3)/guestfs_inspect_list_applications>."
 msgstr ""
 
 #. type: =head2
@@ -21986,17 +22022,17 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:280
 msgid ""
-"In the example above, drive C maps to the filesystem on the second partition "
-"on the first disk, and drive E maps to the filesystem on the first partition "
-"on the second disk."
+"In the example above, drive C maps to the filesystem on the second partition"
+" on the first disk, and drive E maps to the filesystem on the first "
+"partition on the second disk."
 msgstr ""
 
 #. type: textblock
 #: ../inspector/virt-inspector.pod:284
 msgid ""
 "Note that this only covers permanent local filesystem mappings, not things "
-"like network shares.  Furthermore NTFS volume mount points may not be listed "
-"here."
+"like network shares.  Furthermore NTFS volume mount points may not be listed"
+" here."
 msgstr ""
 
 #. type: =head2
@@ -22029,8 +22065,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:302
 msgid ""
-"To display the icon, you have to extract it and convert the base64 data back "
-"to a binary file.  Use an XPath query or simply an editor to extract the "
+"To display the icon, you have to extract it and convert the base64 data back"
+" to a binary file.  Use an XPath query or simply an editor to extract the "
 "data, then use the coreutils L<base64(1)> program to do the conversion back "
 "to a PNG file:"
 msgstr ""
@@ -22051,8 +22087,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:311
 msgid ""
-"Virt-inspector can detect some operating system installers on install disks, "
-"live CDs, bootable USB keys and more."
+"Virt-inspector can detect some operating system installers on install disks,"
+" live CDs, bootable USB keys and more."
 msgstr ""
 
 #. type: textblock
@@ -22090,7 +22126,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:332
 msgid ""
 "You can use the XPath query language to select parts of the XML.  We "
-"recommend using C<xmlstarlet> to perform XPath queries from the command line."
+"recommend using C<xmlstarlet> to perform XPath queries from the command "
+"line."
 msgstr ""
 
 #. type: verbatim
@@ -22133,8 +22170,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:361
 msgid ""
-"Early versions of libguestfs shipped with a different virt-inspector program "
-"written in Perl (the current version is written in C).  The XML output of "
+"Early versions of libguestfs shipped with a different virt-inspector program"
+" written in Perl (the current version is written in C).  The XML output of "
 "the Perl virt-inspector was different and it could also output in other "
 "formats like text."
 msgstr ""
@@ -22164,8 +22201,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:382
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<http://www.w3.org/TR/xpath/>, L<base64(1)"
-">, L<xmlstarlet(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<http://www.w3.org/TR/xpath/>, "
+"L<base64(1)>, L<xmlstarlet(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -22200,9 +22237,9 @@ msgstr ""
 #: ../java/examples/guestfs-java.pod:17
 msgid ""
 "This manual page documents how to call libguestfs from the Java programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -22214,8 +22251,8 @@ msgstr ""
 #: ../java/examples/guestfs-java.pod:24
 msgid ""
 "The handle is closed when it is reaped by the garbage collector.  Because "
-"libguestfs handles include a lot of state, it is also possible to close (and "
-"hence free) them explicitly by calling the C<close> method."
+"libguestfs handles include a lot of state, it is also possible to close (and"
+" hence free) them explicitly by calling the C<close> method."
 msgstr ""
 
 #. type: =head2
@@ -22241,8 +22278,8 @@ msgstr ""
 #. type: textblock
 #: ../java/examples/guestfs-java.pod:47
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-ocaml"
-"(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
 msgstr ""
 
@@ -22294,10 +22331,10 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:27
 msgid ""
-"This manual page documents how to call libguestfs from the OCaml programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"This manual page documents how to call libguestfs from the OCaml programming"
+" language.  This page just documents the differences from the C API and "
+"gives some examples.  If you are not familiar with using libguestfs, you "
+"also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -22308,8 +22345,9 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:34
 msgid ""
-"There are two different programming styles supported by the OCaml bindings.  "
-"You can use a module style, with each C function mapped to an OCaml function:"
+"There are two different programming styles supported by the OCaml bindings."
+"  You can use a module style, with each C function mapped to an OCaml "
+"function:"
 msgstr ""
 
 #. type: verbatim
@@ -22360,8 +22398,8 @@ msgstr ""
 #: ../ocaml/examples/guestfs-ocaml.pod:55
 msgid ""
 "The handle is closed when it is reaped by the garbage collector.  Because "
-"libguestfs handles include a lot of state, it is also possible to close (and "
-"hence free) them explicitly by calling C<Guestfs.close> or the C<#close> "
+"libguestfs handles include a lot of state, it is also possible to close (and"
+" hence free) them explicitly by calling C<Guestfs.close> or the C<#close> "
 "method."
 msgstr ""
 
@@ -22376,17 +22414,17 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:66
 msgid ""
-"Calling any function/method on a closed handle raises C<Guestfs."
-"Handle_closed>.  The single parameter is the name of the function that you "
-"called."
+"Calling any function/method on a closed handle raises "
+"C<Guestfs.Handle_closed>.  The single parameter is the name of the function "
+"that you called."
 msgstr ""
 
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:80
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
-"L<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, L"
+"<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
 msgstr ""
 
 #. type: textblock
@@ -22419,9 +22457,10 @@ msgstr ""
 #: ../perl/examples/guestfs-perl.pod:20
 msgid ""
 "This manual page documents how to call libguestfs from the Perl programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>.  To read the full Perl API, see L<Sys::Guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>.  To read the full Perl API, see "
+"L<Sys::Guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -22432,16 +22471,16 @@ msgstr ""
 #. type: textblock
 #: ../perl/examples/guestfs-perl.pod:28
 msgid ""
-"Errors from libguestfs functions turn into calls to C<croak> (see L<Carp(3)"
-">)."
+"Errors from libguestfs functions turn into calls to C<croak> (see "
+"L<Carp(3)>)."
 msgstr ""
 
 #. type: textblock
 #: ../perl/examples/guestfs-perl.pod:41
 msgid ""
-"L<Sys::Guestfs(3)>, L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang"
-"(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-python(3)>, "
-"L<guestfs-recipes(1)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<Sys::Guestfs(3)>, L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-"
+"erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-python(3)>, L"
+"<guestfs-recipes(1)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -22465,8 +22504,8 @@ msgstr ""
 msgid ""
 "This manual page documents how to call libguestfs from the Python "
 "programming language.  This page just documents the differences from the C "
-"API and gives some examples.  If you are not familiar with using libguestfs, "
-"you also need to read L<guestfs(3)>."
+"API and gives some examples.  If you are not familiar with using libguestfs,"
+" you also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: textblock
@@ -22499,9 +22538,9 @@ msgstr ""
 #. type: textblock
 #: ../python/examples/guestfs-python.pod:44
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-recipes(1)>, "
-"L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-recipes(1)>, L"
+"<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -22569,8 +22608,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:36
 msgid ""
-"You can run virt-rescue on any virtual machine known to libvirt, or directly "
-"on disk image(s):"
+"You can run virt-rescue on any virtual machine known to libvirt, or directly"
+" on disk image(s):"
 msgstr ""
 
 #. type: verbatim
@@ -22606,10 +22645,10 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:47
 msgid ""
 "When you run virt-rescue on a virtual machine or disk image, you are placed "
-"in an interactive bash shell where you can use many ordinary Linux "
-"commands.  What you see in C</> (C</bin>, C</lib> etc) is the rescue "
-"appliance.  You must mount the virtual machine's filesystems by hand.  There "
-"is an empty directory called C</sysroot> where you can mount filesystems."
+"in an interactive bash shell where you can use many ordinary Linux commands."
+"  What you see in C</> (C</bin>, C</lib> etc) is the rescue appliance.  You "
+"must mount the virtual machine's filesystems by hand.  There is an empty "
+"directory called C</sysroot> where you can mount filesystems."
 msgstr ""
 
 #. type: textblock
@@ -22635,8 +22674,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:64
 msgid ""
-"If you don't know what filesystems are available on the virtual machine then "
-"you can use commands such as L<parted(8)> and L<lvs(8)> to find out."
+"If you don't know what filesystems are available on the virtual machine then"
+" you can use commands such as L<parted(8)> and L<lvs(8)> to find out."
 msgstr ""
 
 #. type: textblock
@@ -22728,8 +22767,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:175
 msgid ""
-"Enable SELinux in the rescue appliance.  You should read L<guestfs(3)/"
-"SELINUX> before using this option."
+"Enable SELinux in the rescue appliance.  You should read "
+"L<guestfs(3)/SELINUX> before using this option."
 msgstr ""
 
 #. type: =item
@@ -22819,8 +22858,8 @@ msgstr ""
 msgid ""
 "The virt-rescue appliance needs to be small and so does not include many "
 "network tools.  In particular there is no L<telnet(1)> command.  You can "
-"make TCP connections from the shell using the magical C</dev/tcp/"
-"E<lt>hostnameE<gt>/E<lt>portE<gt>> syntax:"
+"make TCP connections from the shell using the magical "
+"C</dev/tcp/E<lt>hostnameE<gt>/E<lt>portE<gt>> syntax:"
 msgstr ""
 
 #. type: verbatim
@@ -22841,15 +22880,15 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:263
 msgid ""
-"Several environment variables affect virt-rescue.  See L<guestfs(3)/"
-"ENVIRONMENT VARIABLES> for the complete list."
+"Several environment variables affect virt-rescue.  See "
+"L<guestfs(3)/ENVIRONMENT VARIABLES> for the complete list."
 msgstr ""
 
 #. type: textblock
 #: ../rescue/virt-rescue.pod:290
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<http://"
-"libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -22871,8 +22910,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:15
 msgid ""
 "Virt-resize is a tool which can resize a virtual machine disk, making it "
-"larger or smaller overall, and resizing or deleting any partitions contained "
-"within."
+"larger or smaller overall, and resizing or deleting any partitions contained"
+" within."
 msgstr ""
 
 #. type: textblock
@@ -23043,7 +23082,8 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:92
-msgid "Use L<virt-filesystems(1)> to display the current partitions and sizes:"
+msgid ""
+"Use L<virt-filesystems(1)> to display the current partitions and sizes:"
 msgstr ""
 
 #. type: verbatim
@@ -23200,11 +23240,12 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:157
 msgid ""
-"If the expanded partition in the image contains a filesystem or LVM PV, then "
-"if virt-resize knows how, it will resize the contents, the equivalent of "
+"If the expanded partition in the image contains a filesystem or LVM PV, then"
+" if virt-resize knows how, it will resize the contents, the equivalent of "
 "calling a command such as L<pvresize(8)>, L<resize2fs(8)>, L<ntfsresize(8)> "
 "or L<btrfs(8)>.  However virt-resize does not know how to resize some "
-"filesystems, so you would have to online resize them after booting the guest."
+"filesystems, so you would have to online resize them after booting the "
+"guest."
 msgstr ""
 
 #. type: textblock
@@ -23238,8 +23279,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:174
 msgid ""
-"Change E<lt>source ...E<gt>, see L<http://libvirt.org/formatdomain."
-"html#elementsDisks>"
+"Change E<lt>source ...E<gt>, see "
+"L<http://libvirt.org/formatdomain.html#elementsDisks>"
 msgstr ""
 
 #. type: textblock
@@ -23276,8 +23317,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:188
 msgid ""
 "Once the guest has booted you should see the new space available, at least "
-"for filesystems that virt-resize knows how to resize, and for PVs.  The user "
-"may need to resize LVs inside PVs, and also resize filesystem types that "
+"for filesystems that virt-resize knows how to resize, and for PVs.  The user"
+" may need to resize LVs inside PVs, and also resize filesystem types that "
 "virt-resize does not know how to expand."
 msgstr ""
 
@@ -23329,8 +23370,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:215
 msgid ""
 "virt-resize also gives a convenient way to ignore or delete partitions when "
-"copying from the input disk to the output disk.  Ignoring a partition speeds "
-"up the copy where you don't care about the existing contents of a "
+"copying from the input disk to the output disk.  Ignoring a partition speeds"
+" up the copy where you don't care about the existing contents of a "
 "partition.  Deleting a partition removes it completely, but note that it "
 "also renumbers any partitions after the one which is deleted, which can "
 "leave some guests unbootable."
@@ -23344,10 +23385,10 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:224
 msgid ""
-"If the input disk is in qcow2 format, then you may prefer that the output is "
-"in qcow2 format as well.  Alternately, virt-resize can convert the format on "
-"the fly.  The output format is simply determined by the format of the empty "
-"output container that you provide.  Thus to create qcow2 output, use:"
+"If the input disk is in qcow2 format, then you may prefer that the output is"
+" in qcow2 format as well.  Alternately, virt-resize can convert the format "
+"on the fly.  The output format is simply determined by the format of the "
+"empty output container that you provide.  Thus to create qcow2 output, use:"
 msgstr ""
 
 #. type: verbatim
@@ -23379,8 +23420,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:238
 msgid ""
-"(on older systems that don't have the L<fallocate(1)> command use C<dd if=/"
-"dev/zero of=outdisk bs=1M count=..>)"
+"(on older systems that don't have the L<fallocate(1)> command use C<dd "
+"if=/dev/zero of=outdisk bs=1M count=..>)"
 msgstr ""
 
 #. type: =head2
@@ -23398,10 +23439,10 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:246
 msgid ""
-"To understand what is going on, firstly one of the four partitions C</dev/"
-"sda1-4> will have MBR partition type C<05> or C<0f>.  This is called the "
-"B<extended partition>.  Use L<virt-filesystems(1)> to see the MBR partition "
-"type."
+"To understand what is going on, firstly one of the four partitions "
+"C</dev/sda1-4> will have MBR partition type C<05> or C<0f>.  This is called "
+"the B<extended partition>.  Use L<virt-filesystems(1)> to see the MBR "
+"partition type."
 msgstr ""
 
 #. type: textblock
@@ -23412,18 +23453,18 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:253
 msgid ""
-"The extended partition can be expanded, but not shrunk (unless you force it, "
-"which is not advisable).  When the extended partition is copied across, all "
-"the logical partitions contained inside are copied over implicitly.  Virt-"
-"resize does not look inside the extended partition, so it copies the logical "
-"partitions blindly."
+"The extended partition can be expanded, but not shrunk (unless you force it,"
+" which is not advisable).  When the extended partition is copied across, all"
+" the logical partitions contained inside are copied over implicitly.  Virt-"
+"resize does not look inside the extended partition, so it copies the logical"
+" partitions blindly."
 msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:259
 msgid ""
-"You cannot specify a logical partition (C</dev/sda5+>) at all on the command "
-"line.  Doing so will give an error."
+"You cannot specify a logical partition (C</dev/sda5+>) at all on the command"
+" line.  Doing so will give an error."
 msgstr ""
 
 #. type: textblock
@@ -23449,8 +23490,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:276
 msgid ""
-"Align the first partition for improved performance (see also the I<--"
-"alignment> option)."
+"Align the first partition for improved performance (see also the "
+"I<--alignment> option)."
 msgstr ""
 
 #. type: textblock
@@ -23465,8 +23506,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:284
 msgid ""
-"I<--align-first never> means we never move the first partition.  This is the "
-"safest option.  Try this if the guest does not boot after resizing."
+"I<--align-first never> means we never move the first partition.  This is the"
+" safest option.  Try this if the guest does not boot after resizing."
 msgstr ""
 
 #. type: textblock
@@ -23485,8 +23526,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:294
 msgid ""
-"Set the alignment of partitions to C<N> sectors.  The default in virt-resize "
-"E<lt> 1.13.19 was 64 sectors, and after that is 128 sectors."
+"Set the alignment of partitions to C<N> sectors.  The default in virt-resize"
+" E<lt> 1.13.19 was 64 sectors, and after that is 128 sectors."
 msgstr ""
 
 #. type: textblock
@@ -23504,9 +23545,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:305
 msgid ""
-"The partitions would be packed together as closely as possible, but would be "
-"completely unaligned.  In some cases this can cause very poor performance.  "
-"See L<virt-alignment-scan(1)> for further details."
+"The partitions would be packed together as closely as possible, but would be"
+" completely unaligned.  In some cases this can cause very poor performance."
+"  See L<virt-alignment-scan(1)> for further details."
 msgstr ""
 
 #. type: =item
@@ -23517,8 +23558,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:311
 msgid ""
-"This would be the minimum acceptable alignment for reasonable performance on "
-"modern hosts."
+"This would be the minimum acceptable alignment for reasonable performance on"
+" modern hosts."
 msgstr ""
 
 #. type: =item
@@ -23627,9 +23668,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:367
 msgid ""
-"The filesystem must have been shut down consistently last time it was used.  "
-"Additionally, L<ntfsresize(8)> marks the resized filesystem as requiring a "
-"consistency check, so at the first boot after resizing Windows will check "
+"The filesystem must have been shut down consistently last time it was used."
+"  Additionally, L<ntfsresize(8)> marks the resized filesystem as requiring a"
+" consistency check, so at the first boot after resizing Windows will check "
 "the disk."
 msgstr ""
 
@@ -23681,8 +23722,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:399
 msgid ""
 "Ignore the named partition.  Effectively this means the partition is "
-"allocated on the destination disk, but the content is not copied across from "
-"the source disk.  The content of the partition will be blank (all zero "
+"allocated on the destination disk, but the content is not copied across from"
+" the source disk.  The content of the partition will be blank (all zero "
 "bytes)."
 msgstr ""
 
@@ -23696,8 +23737,8 @@ msgstr ""
 msgid ""
 "This takes the logical volume and, as a final step, expands it to fill all "
 "the space available in its volume group.  A typical usage, assuming a Linux "
-"guest with a single PV C</dev/sda2> and a root device called C</dev/vg_guest/"
-"lv_root> would be:"
+"guest with a single PV C</dev/sda2> and a root device called "
+"C</dev/vg_guest/lv_root> would be:"
 msgstr ""
 
 #. type: verbatim
@@ -23719,9 +23760,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:419
 msgid ""
-"The contents of the LV are also resized if virt-resize knows how to do "
-"that.  You can stop virt-resize from trying to expand the content by using "
-"the option I<--no-expand-content>."
+"The contents of the LV are also resized if virt-resize knows how to do that."
+"  You can stop virt-resize from trying to expand the content by using the "
+"option I<--no-expand-content>."
 msgstr ""
 
 #. type: textblock
@@ -23790,9 +23831,9 @@ msgstr ""
 msgid ""
 "By default, virt-resize creates an extra partition if there is any extra, "
 "unused space after all resizing has happened.  Use this option to prevent "
-"the extra partition from being created.  If you do this then the extra space "
-"will be inaccessible until you run fdisk, parted, or some other partitioning "
-"tool in the guest."
+"the extra partition from being created.  If you do this then the extra space"
+" will be inaccessible until you run fdisk, parted, or some other "
+"partitioning tool in the guest."
 msgstr ""
 
 #. type: textblock
@@ -23843,8 +23884,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:480
 msgid ""
-"Specify the format of the output disk image.  If this flag is not given then "
-"it is auto-detected from the image itself."
+"Specify the format of the output disk image.  If this flag is not given then"
+" it is auto-detected from the image itself."
 msgstr ""
 
 #. type: textblock
@@ -23877,8 +23918,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:502
 msgid ""
 "C<size> can be expressed as an absolute number followed by b/K/M/G to mean "
-"bytes, Kilobytes, Megabytes, or Gigabytes; or as a percentage of the current "
-"size; or as a relative number or percentage.  For example:"
+"bytes, Kilobytes, Megabytes, or Gigabytes; or as a percentage of the current"
+" size; or as a relative number or percentage.  For example:"
 msgstr ""
 
 #. type: verbatim
@@ -23964,8 +24005,8 @@ msgid ""
 "This is the same as I<--resize> except that it will let you decrease the "
 "size of any partition.  Generally this means you will lose any data which "
 "was at the end of the partition you shrink, but you may not care about that "
-"(eg. if shrinking an unused partition, or if you can easily recreate it such "
-"as a swap partition)."
+"(eg. if shrinking an unused partition, or if you can easily recreate it such"
+" as a swap partition)."
 msgstr ""
 
 #. type: textblock
@@ -23993,10 +24034,10 @@ msgstr ""
 msgid ""
 "The amount by which the overall disk must be shrunk (after carrying out all "
 "other operations requested by the user) is called the \"deficit\".  For "
-"example, a straight copy (assume no other operations)  from a 5GB disk image "
-"to a 4GB disk image results in a 1GB deficit.  In this case, virt-resize "
-"would give an error unless the user specified a partition to shrink and that "
-"partition had more than a gigabyte of free space."
+"example, a straight copy (assume no other operations)  from a 5GB disk image"
+" to a 4GB disk image results in a 1GB deficit.  In this case, virt-resize "
+"would give an error unless the user specified a partition to shrink and that"
+" partition had more than a gigabyte of free space."
 msgstr ""
 
 #. type: =head1
@@ -24007,9 +24048,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:571
 msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-resize from other programs, GUIs "
-"etc."
+"The I<--machine-readable> option can be used to make the output more machine"
+" friendly, which is useful when calling virt-resize from other programs, "
+"GUIs etc."
 msgstr ""
 
 #. type: textblock
@@ -24082,8 +24123,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:612
 msgid ""
-"The calling program should treat messages sent to stderr as error messages.  "
-"In addition, virt-resize exits with a non-zero status code if there was a "
+"The calling program should treat messages sent to stderr as error messages."
+"  In addition, virt-resize exits with a non-zero status code if there was a "
 "fatal error."
 msgstr ""
 
@@ -24102,12 +24143,12 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:625
 msgid ""
-"Virt-resize aligns partitions to multiples of 128 sectors (see the I<--"
-"alignment> parameter).  Usually this means the partitions will not be "
+"Virt-resize aligns partitions to multiples of 128 sectors (see the "
+"I<--alignment> parameter).  Usually this means the partitions will not be "
 "aligned to the ancient CHS geometry.  However CHS geometry is meaningless "
-"for disks manufactured since the early 1990s, and doubly so for virtual hard "
-"drives.  Alignment of partitions to cylinders is not required by any modern "
-"operating system."
+"for disks manufactured since the early 1990s, and doubly so for virtual hard"
+" drives.  Alignment of partitions to cylinders is not required by any modern"
+" operating system."
 msgstr ""
 
 #. type: =head2
@@ -24129,8 +24170,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:641
 msgid ""
 "Windows may initiate a lengthy \"chkdsk\" on first boot after a resize, if "
-"NTFS partitions have been expanded.  This is just a safety check and (unless "
-"it find errors) is nothing to worry about."
+"NTFS partitions have been expanded.  This is just a safety check and (unless"
+" it find errors) is nothing to worry about."
 msgstr ""
 
 #. type: =head2
@@ -24181,8 +24222,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:665
 msgid ""
 "L<parted(8)> and its graphical shell gparted can do some types of resizing "
-"operations on disk images.  They can resize and move partitions, but I don't "
-"think they can do anything with the contents, and they certainly don't "
+"operations on disk images.  They can resize and move partitions, but I don't"
+" think they can do anything with the contents, and they certainly don't "
 "understand LVM."
 msgstr ""
 
@@ -24190,20 +24231,20 @@ msgstr ""
 #: ../resize/virt-resize.pod:670
 msgid ""
 "L<guestfish(1)> can do everything that virt-resize can do and a lot more, "
-"but at a much lower level.  You will probably end up hand-calculating sector "
-"offsets, which is something that virt-resize was designed to avoid.  If you "
-"want to see the guestfish-equivalent commands that virt-resize runs, use the "
-"I<--debug> flag."
+"but at a much lower level.  You will probably end up hand-calculating sector"
+" offsets, which is something that virt-resize was designed to avoid.  If you"
+" want to see the guestfish-equivalent commands that virt-resize runs, use "
+"the I<--debug> flag."
 msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:690
 msgid ""
-"L<virt-filesystems(1)>, L<virt-df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<lvm"
-"(8)>, L<pvresize(8)>, L<lvresize(8)>, L<resize2fs(8)>, L<ntfsresize(8)>, "
-"L<btrfs(8)>, L<virsh(1)>, L<parted(8)>, L<truncate(1)>, L<fallocate(1)>, "
-"L<grub(8)>, L<grub-install(8)>, L<virt-rescue(1)>, L<virt-sparsify(1)>, "
-"L<virt-alignment-scan(1)>, L<http://libguestfs.org/>."
+"L<virt-filesystems(1)>, L<virt-df(1)>, L<guestfs(3)>, L<guestfish(1)>, "
+"L<lvm(8)>, L<pvresize(8)>, L<lvresize(8)>, L<resize2fs(8)>, "
+"L<ntfsresize(8)>, L<btrfs(8)>, L<virsh(1)>, L<parted(8)>, L<truncate(1)>, "
+"L<fallocate(1)>, L<grub(8)>, L<grub-install(8)>, L<virt-rescue(1)>, L<virt-"
+"sparsify(1)>, L<virt-alignment-scan(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -24227,9 +24268,9 @@ msgstr ""
 #: ../ruby/examples/guestfs-ruby.pod:17
 msgid ""
 "This manual page documents how to call libguestfs from the Ruby programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: textblock
@@ -24242,9 +24283,9 @@ msgstr ""
 #. type: textblock
 #: ../ruby/examples/guestfs-ruby.pod:38
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, "
-"L<guestfs-recipes(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L"
+"<guestfs-recipes(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -24311,8 +24352,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:45
 msgid ""
-"Virt-sparsify may require up to 2x the virtual size of the source disk image "
-"(1 temporary copy + 1 destination image).  This is in the worst case and "
+"Virt-sparsify may require up to 2x the virtual size of the source disk image"
+" (1 temporary copy + 1 destination image).  This is in the worst case and "
 "usually much less space is required."
 msgstr ""
 
@@ -24368,7 +24409,8 @@ msgstr ""
 msgid ""
 "which copies C<indisk> to C<outdisk>, making the output sparse.  C<outdisk> "
 "is created, or overwritten if it already exists.  The format of the input "
-"disk is detected (eg. qcow2) and the same format is used for the output disk."
+"disk is detected (eg. qcow2) and the same format is used for the output "
+"disk."
 msgstr ""
 
 #. type: textblock
@@ -24388,8 +24430,8 @@ msgstr ""
 #: ../sparsify/virt-sparsify.pod:90
 msgid ""
 "Virt-sparsify tries to zero and sparsify free space on every filesystem it "
-"can find within the source disk image.  You can get it to ignore (don't zero "
-"free space on) certain filesystems by doing:"
+"can find within the source disk image.  You can get it to ignore (don't zero"
+" free space on) certain filesystems by doing:"
 msgstr ""
 
 #. type: verbatim
@@ -24443,8 +24485,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:122
 msgid ""
-"Specifying the I<--convert> option is usually a good idea, because then virt-"
-"sparsify doesn't need to try to guess the input format."
+"Specifying the I<--convert> option is usually a good idea, because then "
+"virt-sparsify doesn't need to try to guess the input format."
 msgstr ""
 
 #. type: =item
@@ -24484,8 +24526,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:179
 msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-sparsify from other programs, "
+"The I<--machine-readable> option can be used to make the output more machine"
+" friendly, which is useful when calling virt-sparsify from other programs, "
 "GUIs etc."
 msgstr ""
 
@@ -24510,9 +24552,9 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:218
 msgid ""
-"The calling program should treat messages sent to stderr as error messages.  "
-"In addition, virt-sparsify exits with a non-zero status code if there was a "
-"fatal error."
+"The calling program should treat messages sent to stderr as error messages."
+"  In addition, virt-sparsify exits with a non-zero status code if there was "
+"a fatal error."
 msgstr ""
 
 #. type: textblock
@@ -24525,8 +24567,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:238
 msgid ""
-"Location of the temporary directory used for the potentially large temporary "
-"overlay file."
+"Location of the temporary directory used for the potentially large temporary"
+" overlay file."
 msgstr ""
 
 #. type: textblock
@@ -24551,9 +24593,9 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:253
 msgid ""
-"L<virt-filesystems(1)>, L<virt-df(1)>, L<virt-resize(1)>, L<virt-rescue(1)>, "
-"L<guestfs(3)>, L<guestfish(1)>, L<truncate(1)>, L<fallocate(1)>, L<qemu-img"
-"(1)>, L<http://libguestfs.org/>."
+"L<virt-filesystems(1)>, L<virt-df(1)>, L<virt-resize(1)>, L<virt-rescue(1)>,"
+" L<guestfs(3)>, L<guestfish(1)>, L<truncate(1)>, L<fallocate(1)>, L<qemu-"
+"img(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: =head2
@@ -24575,8 +24617,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:7 ../src/guestfs-actions.pod:302
 #: ../src/guestfs-actions.pod:323
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_add_drive_opts> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_add_drive_opts> call instead."
 msgstr ""
 
 #. type: textblock
@@ -24584,8 +24626,8 @@ msgstr ""
 msgid ""
 "This call checks for the existence of C<filename>.  This stops you from "
 "specifying other types of drive which are supported by qemu such as C<nbd:> "
-"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call "
-"instead."
+"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -24752,10 +24794,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:60
 msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on each "
-"one."
+"This function adds the disk(s) attached to the named libvirt domain C<dom>."
+"  It works by connecting to libvirt, requesting the domain and domain XML "
+"from libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on"
+" each one."
 msgstr ""
 
 #. type: textblock
@@ -24865,8 +24907,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:176
 msgid ""
-"This function is the equivalent of calling C<guestfs_add_drive_opts> with no "
-"optional parameters, so the disk is added writable, with the format being "
+"This function is the equivalent of calling C<guestfs_add_drive_opts> with no"
+" optional parameters, so the disk is added writable, with the format being "
 "detected automatically."
 msgstr ""
 
@@ -24910,8 +24952,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:233
 msgid ""
-"This forces the image format.  If you omit this (or use C<guestfs_add_drive> "
-"or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
+"This forces the image format.  If you omit this (or use C<guestfs_add_drive>"
+" or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
 "Possible formats include C<raw> and C<qcow2>."
 msgstr ""
 
@@ -25016,8 +25058,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:309
 msgid ""
-"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the "
-"QEMU interface emulation to use at run time."
+"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the"
+" QEMU interface emulation to use at run time."
 msgstr ""
 
 #. type: textblock
@@ -25086,9 +25128,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:355
 msgid ""
-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call C<guestfs_aug_init> again before you can use "
-"any other Augeas functions."
+"Close the current Augeas handle and free up any resources used by it.  After"
+" calling this, you have to call C<guestfs_aug_init> again before you can use"
+" any other Augeas functions."
 msgstr ""
 
 #. type: textblock
@@ -25219,9 +25261,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:457
 msgid ""
-"This option is only useful when debugging Augeas lenses.  Use of this option "
-"may require additional memory for the libguestfs appliance.  You may need to "
-"set the C<LIBGUESTFS_MEMSIZE> environment variable or call "
+"This option is only useful when debugging Augeas lenses.  Use of this option"
+" may require additional memory for the libguestfs appliance.  You may need "
+"to set the C<LIBGUESTFS_MEMSIZE> environment variable or call "
 "C<guestfs_set_memsize>."
 msgstr ""
 
@@ -25312,9 +25354,9 @@ msgstr ""
 #: ../src/guestfs-actions.pod:8345 ../src/guestfs-actions.pod:8391
 #: ../src/guestfs-actions.pod:8410
 msgid ""
-"This function returns a NULL-terminated array of strings (like L<environ(3)"
-">), or NULL if there was an error.  I<The caller must free the strings and "
-"the array after use>."
+"This function returns a NULL-terminated array of strings (like "
+"L<environ(3)>), or NULL if there was an error.  I<The caller must free the "
+"strings and the array after use>."
 msgstr ""
 
 #. type: textblock
@@ -25821,8 +25863,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:970
 msgid ""
-"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return C<"
-"\"/WINDOWS/system32\"> (the exact return value would depend on details of "
+"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return "
+"C<\"/WINDOWS/system32\"> (the exact return value would depend on details of "
 "how the directories were originally created under Windows)."
 msgstr ""
 
@@ -26011,8 +26053,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1152
 msgid ""
 "The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
+"is the name of the program to run.  Subsequent elements are parameters.  The"
+" list must be non-empty (ie. must contain a program name).  Note that the "
 "command runs directly, and is I<not> invoked via the shell (see "
 "C<guestfs_sh>)."
 msgstr ""
@@ -26041,8 +26083,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1191
 msgid ""
-"This is the same as C<guestfs_command>, but splits the result into a list of "
-"lines."
+"This is the same as C<guestfs_command>, but splits the result into a list of"
+" lines."
 msgstr ""
 
 #. type: textblock
@@ -26271,8 +26313,8 @@ msgstr ""
 msgid ""
 "This long-running command can generate progress notification messages so "
 "that the caller can display a progress bar or indicator.  To receive these "
-"messages, the caller must register a progress event callback.  See L<guestfs"
-"(3)/GUESTFS_EVENT_PROGRESS>."
+"messages, the caller must register a progress event callback.  See "
+"L<guestfs(3)/GUESTFS_EVENT_PROGRESS>."
 msgstr ""
 
 #. type: =head2
@@ -26498,8 +26540,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1525
 msgid ""
-"This is B<not> the function you want for copying files.  This is for copying "
-"blocks within existing files.  See C<guestfs_cp>, C<guestfs_cp_a> and "
+"This is B<not> the function you want for copying files.  This is for copying"
+" blocks within existing files.  See C<guestfs_cp>, C<guestfs_cp_a> and "
 "C<guestfs_mv> for general file copying and moving functions."
 msgstr ""
 
@@ -26567,8 +26609,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1569 ../src/guestfs-actions.pod:1626
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_copy_device_to_device> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_copy_device_to_device> call instead."
 msgstr ""
 
 #. type: textblock
@@ -26638,8 +26680,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1638
 msgid ""
 "If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see C<guestfs_copy_device_to_device>)."
+"source file or device, otherwise the copy will fail.  This command cannot do"
+" partial copies (see C<guestfs_copy_device_to_device>)."
 msgstr ""
 
 #. type: =head2
@@ -26754,8 +26796,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1737
 msgid ""
 "Note that there is no limit on the amount of data that can be downloaded "
-"with this call, unlike with C<guestfs_pread>, and this call always reads the "
-"full amount unless an error occurs."
+"with this call, unlike with C<guestfs_pread>, and this call always reads the"
+" full amount unless an error occurs."
 msgstr ""
 
 #. type: textblock
@@ -26959,8 +27001,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1909
 msgid ""
-"I<This function is deprecated.> In new code, use the L</guestfs_fallocate64> "
-"call instead."
+"I<This function is deprecated.> In new code, use the L</guestfs_fallocate64>"
+" call instead."
 msgstr ""
 
 #. type: =head2
@@ -27306,8 +27348,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2362
 msgid ""
-"This function returns a string which may be NULL.  There is no way to return "
-"an error from this function.  The string is owned by the guest handle and "
+"This function returns a string which may be NULL.  There is no way to return"
+" an error from this function.  The string is owned by the guest handle and "
 "must I<not> be freed."
 msgstr ""
 
@@ -27445,8 +27487,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2452
 msgid ""
 "If C<guestfs_set_memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default"
+" value for memsize."
 msgstr ""
 
 #. type: textblock
@@ -27667,8 +27709,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2596
 msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling C<guestfs_umask>."
+"Return the current umask.  By default the umask is C<022> unless it has been"
+" set by calling C<guestfs_umask>."
 msgstr ""
 
 #. type: =head2
@@ -27752,8 +27794,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6284
 msgid ""
 "This function returns a buffer, or NULL on error.  The size of the returned "
-"buffer is written to C<*size_r>.  I<The caller must free the returned buffer "
-"after use>."
+"buffer is written to C<*size_r>.  I<The caller must free the returned buffer"
+" after use>."
 msgstr ""
 
 #. type: textblock
@@ -27785,8 +27827,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2673 ../src/guestfs-actions.pod:4164
 #: ../src/guestfs-actions.pod:4852
 msgid ""
-"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was "
-"an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
+"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was"
+" an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
 msgstr ""
 
 #. type: textblock
@@ -28007,8 +28049,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2936
 msgid ""
-"This function is a helpful wrapper around C<guestfs_inotify_read> which just "
-"returns a list of pathnames of objects that were touched.  The returned "
+"This function is a helpful wrapper around C<guestfs_inotify_read> which just"
+" returns a list of pathnames of objects that were touched.  The returned "
 "pathnames are sorted and deduplicated."
 msgstr ""
 
@@ -28030,8 +28072,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2956
 msgid ""
-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
+"C<maxevents> is the maximum number of events which will be queued up between"
+" calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
 "passed as C<0>, then the kernel (or previously set)  default is used.  For "
 "Linux 2.6.29 the default was 16384 events.  Beyond this limit, the kernel "
 "throws away events, but records the fact that it threw them away by setting "
@@ -28051,8 +28093,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2972
 msgid ""
 "Queued up events should be read periodically by calling "
-"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful "
-"wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
+"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful"
+" wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
 "often enough then you risk the internal queue overflowing."
 msgstr ""
 
@@ -28103,7 +28145,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:3020
 msgid ""
-"Remove a previously defined inotify watch.  See C<guestfs_inotify_add_watch>."
+"Remove a previously defined inotify watch.  See "
+"C<guestfs_inotify_add_watch>."
 msgstr ""
 
 #. type: =head2
@@ -28409,8 +28452,8 @@ msgstr ""
 msgid ""
 "This function and C<guestfs_inspect_get_package_management> return the "
 "package format and package management tool used by the inspected operating "
-"system.  For example for Fedora these functions would return C<rpm> (package "
-"format) and C<yum> (package management)."
+"system.  For example for Fedora these functions would return C<rpm> (package"
+" format) and C<yum> (package management)."
 msgstr ""
 
 #. type: textblock
@@ -28654,13 +28697,13 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:3731
 msgid ""
-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call C<guestfs_inspect_os>, then "
+"I<Note:> This call works differently from other parts of the inspection API."
+"  You have to call C<guestfs_inspect_os>, then "
 "C<guestfs_inspect_get_mountpoints>, then mount up the disks, before calling "
 "this.  Listing applications is a significantly more difficult operation "
 "which requires access to the full filesystem.  Also note that unlike the "
-"other C<guestfs_inspect_get_*> calls which are just returning data cached in "
-"the libguestfs handle, this call actually reads parts of the mounted "
+"other C<guestfs_inspect_get_*> calls which are just returning data cached in"
+" the libguestfs handle, this call actually reads parts of the mounted "
 "filesystems during the call."
 msgstr ""
 
@@ -28668,8 +28711,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:3821
 msgid ""
 "This function returns a C<struct guestfs_application_list *>, or NULL if "
-"there was an error.  I<The caller must call C<guestfs_free_application_list> "
-"after use>."
+"there was an error.  I<The caller must call C<guestfs_free_application_list>"
+" after use>."
 msgstr ""
 
 #. type: textblock
@@ -28695,16 +28738,16 @@ msgstr ""
 #: ../src/guestfs-actions.pod:3845
 msgid ""
 "You can pass the root string(s) returned to other C<guestfs_inspect_get_*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+"functions in order to query further information about each operating system,"
+" such as the name and version."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:3850
 msgid ""
-"This function uses other libguestfs features such as C<guestfs_mount_ro> and "
-"C<guestfs_umount_all> in order to mount and unmount filesystems and look at "
-"the contents.  This should be called with no disks currently mounted.  The "
+"This function uses other libguestfs features such as C<guestfs_mount_ro> and"
+" C<guestfs_umount_all> in order to mount and unmount filesystems and look at"
+" the contents.  This should be called with no disks currently mounted.  The "
 "function may also use Augeas, so any existing Augeas handle will be closed."
 msgstr ""
 
@@ -29033,8 +29076,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4160
 msgid ""
-"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link, "
-"then it returns the extended attributes of the link itself."
+"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link,"
+" then it returns the extended attributes of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -29128,7 +29171,8 @@ msgid ""
 "partitions are returned in the list.  Also this command does not check that "
 "each filesystem found is valid and mountable, and some filesystems might be "
 "mountable but require special options.  Filesystems may not all belong to a "
-"single logical operating system (use C<guestfs_inspect_os> to look for OSes)."
+"single logical operating system (use C<guestfs_inspect_os> to look for "
+"OSes)."
 msgstr ""
 
 #. type: textblock
@@ -29368,8 +29412,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4441
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lxattrlist> "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also C<guestfs_lxattrlist> "
 "for a similarly efficient call for getting extended attributes.  Very long "
 "directory listings might cause the protocol message size to be exceeded, "
 "causing this call to fail.  The caller must split up such requests into "
@@ -29404,8 +29448,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4469
 msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use C<guestfs_luks_kill_slot> first to remove that key."
+"Note that if C<keyslot> already contains a key, then this command will fail."
+"  You have to use C<guestfs_luks_kill_slot> first to remove that key."
 msgstr ""
 
 #. type: textblock
@@ -29443,9 +29487,9 @@ msgstr ""
 #: ../src/guestfs-actions.pod:4487
 msgid ""
 "This closes a LUKS device that was created earlier by C<guestfs_luks_open> "
-"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the "
-"LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
-"underlying block device."
+"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the"
+" LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the"
+" underlying block device."
 msgstr ""
 
 #. type: textblock
@@ -29493,8 +29537,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4530
 msgid ""
-"This command is the same as C<guestfs_luks_format> but it also allows you to "
-"set the C<cipher> used."
+"This command is the same as C<guestfs_luks_format> but it also allows you to"
+" set the C<cipher> used."
 msgstr ""
 
 #. type: =head2
@@ -29776,7 +29820,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:4804
 msgid ""
 "This function returns a C<struct guestfs_lvm_lv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -29813,12 +29858,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4844
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lstatlist> for "
-"a similarly efficient call for getting standard stats.  Very long directory "
-"listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also C<guestfs_lstatlist> "
+"for a similarly efficient call for getting standard stats.  Very long "
+"directory listings might cause the protocol message size to be exceeded, "
+"causing this call to fail.  The caller must split up such requests into "
+"smaller groups of names."
 msgstr ""
 
 #. type: =head2
@@ -30081,8 +30126,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5081
 msgid ""
 "This call is similar to C<guestfs_mkfs>, but it allows you to control the "
-"block size of the resulting filesystem.  Supported block sizes depend on the "
-"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
+"block size of the resulting filesystem.  Supported block sizes depend on the"
+" filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
 msgstr ""
 
 #. type: =head2
@@ -30206,8 +30251,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5221
 msgid ""
 "Autosync [see C<guestfs_set_autosync>, this is set by default on handles] "
-"can cause C<guestfs_umount_all> to be called when the handle is closed which "
-"can also trigger these issues."
+"can cause C<guestfs_umount_all> to be called when the handle is closed which"
+" can also trigger these issues."
 msgstr ""
 
 #. type: textblock
@@ -30241,8 +30286,8 @@ msgid ""
 "S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
 "regular file).  These constants are available in the standard Linux header "
 "files, or you can use C<guestfs_mknod_b>, C<guestfs_mknod_c> or "
-"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in "
-"the appropriate constant for you."
+"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in"
+" the appropriate constant for you."
 msgstr ""
 
 #. type: =head2
@@ -30567,8 +30612,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5510
 msgid ""
 "This is the same as the C<guestfs_mount> command, but it allows you to set "
-"both the mount options and the vfstype as for the L<mount(8)> I<-o> and I<-"
-"t> flags."
+"both the mount options and the vfstype as for the L<mount(8)> I<-o> and "
+"I<-t> flags."
 msgstr ""
 
 #. type: =head2
@@ -30667,8 +30712,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5596 ../src/guestfs-actions.pod:5696
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_ntfsresize_opts> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_ntfsresize_opts> call instead."
 msgstr ""
 
 #. type: =head2
@@ -30862,8 +30907,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5766
 msgid ""
-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in C<guestfs_part_init>."
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other"
+" possible values are described in C<guestfs_part_init>."
 msgstr ""
 
 #. type: =head2
@@ -30906,8 +30951,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5802 ../src/guestfs-actions.pod:5984
 msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see "
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get"
+" undefined results for other partition table types (see "
 "C<guestfs_part_get_parttype>)."
 msgstr ""
 
@@ -30982,8 +31027,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5945
 msgid ""
-"This function returns a C<struct guestfs_partition_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_partition_list> after "
+"This function returns a C<struct guestfs_partition_list *>, or NULL if there"
+" was an error.  I<The caller must call C<guestfs_free_partition_list> after "
 "use>."
 msgstr ""
 
@@ -31214,8 +31259,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6163
 msgid ""
-"This command is the same as C<guestfs_pvresize> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+"This command is the same as C<guestfs_pvresize> except that it allows you to"
+" specify the new size (in bytes) explicitly."
 msgstr ""
 
 #. type: =head2
@@ -31255,7 +31300,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6197
 msgid ""
 "This function returns a C<struct guestfs_lvm_pv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -31343,8 +31389,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6279
 msgid ""
-"Unlike C<guestfs_cat>, this function can correctly handle files that contain "
-"embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
+"Unlike C<guestfs_cat>, this function can correctly handle files that contain"
+" embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
 "function is limited in the total size of file that can be handled."
 msgstr ""
 
@@ -31404,7 +31450,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6375
 msgid ""
 "This function returns a C<struct guestfs_dirent_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_dirent_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_dirent_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -31674,10 +31721,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6606
 msgid ""
-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
-"and deletes them.  The intention is to scrub any free space on the partition "
-"containing C<dir>."
+"This command creates the directory C<dir> and then fills it with files until"
+" the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
+"and deletes them.  The intention is to scrub any free space on the partition"
+" containing C<dir>."
 msgstr ""
 
 #. type: =head2
@@ -31910,8 +31957,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6861
 msgid ""
-"This only has any effect if called before C<guestfs_launch>, and the default "
-"is true."
+"This only has any effect if called before C<guestfs_launch>, and the default"
+" is true."
 msgstr ""
 
 #. type: =head2
@@ -32146,9 +32193,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7102
 msgid ""
-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see "
+"This displays the disk geometry of C<device> read from the partition table."
+"  Especially in the case where the underlying block device has been resized,"
+" this can be different from the kernel's idea of the geometry (see "
 "C<guestfs_sfdisk_kernel_geometry>)."
 msgstr ""
 
@@ -32299,8 +32346,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7236
 msgid ""
-"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_statvfs> after use>."
+"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an"
+" error.  I<The caller must call C<guestfs_free_statvfs> after use>."
 msgstr ""
 
 #. type: =head2
@@ -32456,8 +32503,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7395
 msgid ""
-"This command enables swap to a file.  See C<guestfs_swapon_device> for other "
-"notes."
+"This command enables swap to a file.  See C<guestfs_swapon_device> for other"
+" notes."
 msgstr ""
 
 #. type: =head2
@@ -32891,8 +32938,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7829
 msgid ""
-"This function returns a C<struct guestfs_version *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_version> after use>."
+"This function returns a C<struct guestfs_version *>, or NULL if there was an"
+" error.  I<The caller must call C<guestfs_free_version> after use>."
 msgstr ""
 
 #. type: textblock
@@ -33129,7 +33176,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:8033
 msgid ""
 "This function returns a C<struct guestfs_lvm_vg_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -33178,8 +33226,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:8069
 msgid ""
-"I<This function is deprecated.> In new code, use the L</guestfs_launch> call "
-"instead."
+"I<This function is deprecated.> In new code, use the L</guestfs_launch> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -33190,16 +33238,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:8078
 msgid ""
-"In versions of the API E<lt> 1.0.71 you had to call this function just after "
-"calling C<guestfs_launch> to wait for the launch to complete.  However this "
-"is no longer necessary because C<guestfs_launch> now does the waiting."
+"In versions of the API E<lt> 1.0.71 you had to call this function just after"
+" calling C<guestfs_launch> to wait for the launch to complete.  However this"
+" is no longer necessary because C<guestfs_launch> now does the waiting."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:8083
 msgid ""
-"If you see any calls to this function in code then you can just remove them, "
-"unless you want to retain compatibility with older versions of the API."
+"If you see any calls to this function in code then you can just remove them,"
+" unless you want to retain compatibility with older versions of the API."
 msgstr ""
 
 #. type: =head2
@@ -33513,11 +33561,11 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:5
 msgid ""
-"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> L</"
-"guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> L</"
-"guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> L</"
-"guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> L</guestfs_aug_rm> "
-"L</guestfs_aug_save> L</guestfs_aug_set>"
+"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> "
+"L</guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> "
+"L</guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> "
+"L</guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> "
+"L</guestfs_aug_rm> L</guestfs_aug_save> L</guestfs_aug_set>"
 msgstr ""
 
 #. type: =item
@@ -33548,9 +33596,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:33
 msgid ""
-"The following functions: L</guestfs_inotify_add_watch> L</"
-"guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init> L</"
-"guestfs_inotify_read> L</guestfs_inotify_rm_watch>"
+"The following functions: L</guestfs_inotify_add_watch> "
+"L</guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init>"
+" L</guestfs_inotify_read> L</guestfs_inotify_rm_watch>"
 msgstr ""
 
 #. type: =item
@@ -33561,8 +33609,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:43
 msgid ""
-"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> L</"
-"guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"
+"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> "
+"L</guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"
 msgstr ""
 
 #. type: =item
@@ -33583,10 +33631,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:57
 msgid ""
-"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> L</"
-"guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> L</"
-"guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> L</"
-"guestfs_setxattr>"
+"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> "
+"L</guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> "
+"L</guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> "
+"L</guestfs_setxattr>"
 msgstr ""
 
 #. type: =item
@@ -33597,9 +33645,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:70
 msgid ""
-"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> L</"
-"guestfs_luks_format> L</guestfs_luks_format_cipher> L</"
-"guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"
+"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> "
+"L</guestfs_luks_format> L</guestfs_luks_format_cipher> "
+"L</guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"
 msgstr ""
 
 #. type: =item
@@ -33610,13 +33658,14 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:81
 msgid ""
-"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> L</"
-"guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> L</"
-"guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> L</"
-"guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> L</"
-"guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> L</"
-"guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> L</"
-"guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> L</guestfs_vgs_full>"
+"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> "
+"L</guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> "
+"L</guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> "
+"L</guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> "
+"L</guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> "
+"L</guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> "
+"L</guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> "
+"L</guestfs_vgs_full>"
 msgstr ""
 
 #. type: =item
@@ -33627,8 +33676,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:106
 msgid ""
-"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> L</"
-"guestfs_mknod_b> L</guestfs_mknod_c>"
+"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> "
+"L</guestfs_mknod_b> L</guestfs_mknod_c>"
 msgstr ""
 
 #. type: =item
@@ -33671,8 +33720,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-availability.pod:131
 msgid ""
-"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> L</"
-"guestfs_scrub_freespace>"
+"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> "
+"L</guestfs_scrub_freespace>"
 msgstr ""
 
 #. type: =item
@@ -34250,9 +34299,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:33
 msgid ""
-"Libguestfs uses Linux kernel and qemu code, and can access any type of guest "
-"filesystem that Linux and qemu can, including but not limited to: ext2/3/4, "
-"btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, "
+"Libguestfs uses Linux kernel and qemu code, and can access any type of guest"
+" filesystem that Linux and qemu can, including but not limited to: ext2/3/4,"
+" btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, "
 "qcow2, vmdk."
 msgstr ""
 
@@ -34268,9 +34317,9 @@ msgstr ""
 #: ../src/guestfs.pod:43
 msgid ""
 "Libguestfs is a library that can be linked with C and C++ management "
-"programs (or management programs written in OCaml, Perl, Python, Ruby, Java, "
-"PHP, Erlang, Haskell or C#).  You can also use it from shell scripts or the "
-"command line."
+"programs (or management programs written in OCaml, Perl, Python, Ruby, Java,"
+" PHP, Erlang, Haskell or C#).  You can also use it from shell scripts or the"
+" command line."
 msgstr ""
 
 #. type: textblock
@@ -34302,8 +34351,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:59
 msgid ""
-"This section provides a gentler overview of the libguestfs API.  We also try "
-"to group API calls together, where that may not be obvious from reading "
+"This section provides a gentler overview of the libguestfs API.  We also try"
+" to group API calls together, where that may not be obvious from reading "
 "about the individual calls in the main section of this manual."
 msgstr ""
 
@@ -34318,13 +34367,14 @@ msgid ""
 "Before you can use libguestfs calls, you have to create a handle.  Then you "
 "must add at least one disk image to the handle, followed by launching the "
 "handle, then performing whatever operations you want, and finally closing "
-"the handle.  By convention we use the single letter C<g> for the name of the "
-"handle variable, although of course you can use any name you want."
+"the handle.  By convention we use the single letter C<g> for the name of the"
+" handle variable, although of course you can use any name you want."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:73
-msgid "The general structure of all libguestfs-using programs looks like this:"
+msgid ""
+"The general structure of all libguestfs-using programs looks like this:"
 msgstr ""
 
 #. type: verbatim
@@ -34433,16 +34483,16 @@ msgstr ""
 msgid ""
 "The image filename (C<\"guest.img\"> in the example above) could be a disk "
 "image from a virtual machine, a L<dd(1)> copy of a physical hard disk, an "
-"actual block device, or simply an empty file of zeroes that you have created "
-"through L<posix_fallocate(3)>.  Libguestfs lets you do useful things to all "
-"of these."
+"actual block device, or simply an empty file of zeroes that you have created"
+" through L<posix_fallocate(3)>.  Libguestfs lets you do useful things to all"
+" of these."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:129
 msgid ""
-"The call you should use in modern code for adding drives is L</"
-"guestfs_add_drive_opts>.  To add a disk image, allowing writes, and "
+"The call you should use in modern code for adding drives is "
+"L</guestfs_add_drive_opts>.  To add a disk image, allowing writes, and "
 "specifying that the format is raw, do:"
 msgstr ""
 
@@ -34483,24 +34533,24 @@ msgstr ""
 #: ../src/guestfs.pod:147
 msgid ""
 "Be extremely cautious if the disk image is in use, eg. if it is being used "
-"by a virtual machine.  Adding it read-write will almost certainly cause disk "
-"corruption, but adding it read-only is safe."
+"by a virtual machine.  Adding it read-write will almost certainly cause disk"
+" corruption, but adding it read-only is safe."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:151
 msgid ""
-"You must add at least one disk image, and you may add multiple disk images.  "
-"In the API, the disk images are usually referred to as C</dev/sda> (for the "
-"first one you added), C</dev/sdb> (for the second one you added), etc."
+"You must add at least one disk image, and you may add multiple disk images."
+"  In the API, the disk images are usually referred to as C</dev/sda> (for "
+"the first one you added), C</dev/sdb> (for the second one you added), etc."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:156
 msgid ""
-"Once L</guestfs_launch> has been called you cannot add any more images.  You "
-"can call L</guestfs_list_devices> to get a list of the device names, in the "
-"order that you added them.  See also L</BLOCK DEVICE NAMING> below."
+"Once L</guestfs_launch> has been called you cannot add any more images.  You"
+" can call L</guestfs_list_devices> to get a list of the device names, in the"
+" order that you added them.  See also L</BLOCK DEVICE NAMING> below."
 msgstr ""
 
 #. type: =head2
@@ -34513,9 +34563,9 @@ msgstr ""
 msgid ""
 "Before you can read or write files, create directories and so on in a disk "
 "image that contains filesystems, you have to mount those filesystems using "
-"L</guestfs_mount_options> or L</guestfs_mount_ro>.  If you already know that "
-"a disk image contains (for example) one partition with a filesystem on that "
-"partition, then you can mount it directly:"
+"L</guestfs_mount_options> or L</guestfs_mount_ro>.  If you already know that"
+" a disk image contains (for example) one partition with a filesystem on that"
+" partition, then you can mount it directly:"
 msgstr ""
 
 #. type: verbatim
@@ -34540,19 +34590,20 @@ msgstr ""
 #: ../src/guestfs.pod:178
 msgid ""
 "If you are given a disk image and you don't know what it contains then you "
-"have to find out.  Libguestfs can do that too: use L</"
-"guestfs_list_partitions> and L</guestfs_lvs> to list possible partitions and "
-"LVs, and either try mounting each to see what is mountable, or else examine "
-"them with L</guestfs_vfs_type> or L</guestfs_file>.  To list just "
+"have to find out.  Libguestfs can do that too: use "
+"L</guestfs_list_partitions> and L</guestfs_lvs> to list possible partitions "
+"and LVs, and either try mounting each to see what is mountable, or else "
+"examine them with L</guestfs_vfs_type> or L</guestfs_file>.  To list just "
 "filesystems, use L</guestfs_list_filesystems>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:186
 msgid ""
-"Libguestfs also has a set of APIs for inspection of unknown disk images (see "
-"L</INSPECTION> below).  But you might find it easier to look at higher level "
-"programs built on top of libguestfs, in particular L<virt-inspector(1)>."
+"Libguestfs also has a set of APIs for inspection of unknown disk images (see"
+" L</INSPECTION> below).  But you might find it easier to look at higher "
+"level programs built on top of libguestfs, in particular L<virt-"
+"inspector(1)>."
 msgstr ""
 
 #. type: textblock
@@ -34603,8 +34654,8 @@ msgstr ""
 #: ../src/guestfs.pod:210
 msgid ""
 "This would return C<data> as a newly allocated buffer containing the full "
-"content of that file (with some conditions: see also L</DOWNLOADING> below), "
-"or C<NULL> if there was an error."
+"content of that file (with some conditions: see also L</DOWNLOADING> below),"
+" or C<NULL> if there was an error."
 msgstr ""
 
 #. type: textblock
@@ -34656,8 +34707,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:233
 msgid ""
-"File writes are affected by the per-handle umask, set by calling L</"
-"guestfs_umask> and defaulting to 022.  See L</UMASK>."
+"File writes are affected by the per-handle umask, set by calling "
+"L</guestfs_umask> and defaulting to 022.  See L</UMASK>."
 msgstr ""
 
 #. type: =head2
@@ -34668,8 +34719,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:238
 msgid ""
-"Libguestfs contains API calls to read, create and modify partition tables on "
-"disk images."
+"Libguestfs contains API calls to read, create and modify partition tables on"
+" disk images."
 msgstr ""
 
 #. type: textblock
@@ -34693,7 +34744,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:250
 msgid ""
-"Obviously this effectively wipes anything that was on that disk image before."
+"Obviously this effectively wipes anything that was on that disk image "
+"before."
 msgstr ""
 
 #. type: =head2
@@ -34704,17 +34756,17 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:255
 msgid ""
-"Libguestfs provides access to a large part of the LVM2 API, such as L</"
-"guestfs_lvcreate> and L</guestfs_vgremove>.  It won't make much sense unless "
-"you familiarize yourself with the concepts of physical volumes, volume "
-"groups and logical volumes."
+"Libguestfs provides access to a large part of the LVM2 API, such as "
+"L</guestfs_lvcreate> and L</guestfs_vgremove>.  It won't make much sense "
+"unless you familiarize yourself with the concepts of physical volumes, "
+"volume groups and logical volumes."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:260
 msgid ""
-"This author strongly recommends reading the LVM HOWTO, online at L<http://"
-"tldp.org/HOWTO/LVM-HOWTO/>."
+"This author strongly recommends reading the LVM HOWTO, online at "
+"L<http://tldp.org/HOWTO/LVM-HOWTO/>."
 msgstr ""
 
 #. type: =head2
@@ -34726,8 +34778,8 @@ msgstr ""
 #: ../src/guestfs.pod:265
 msgid ""
 "Use L</guestfs_cat> to download small, text only files.  This call is "
-"limited to files which are less than 2 MB and which cannot contain any ASCII "
-"NUL (C<\\0>) characters.  However the API is very simple to use."
+"limited to files which are less than 2 MB and which cannot contain any ASCII"
+" NUL (C<\\0>) characters.  However the API is very simple to use."
 msgstr ""
 
 #. type: textblock
@@ -34759,24 +34811,25 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:281
 msgid ""
-"It's often the case that you want to write a file or files to the disk image."
+"It's often the case that you want to write a file or files to the disk "
+"image."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:284
 msgid ""
 "To write a small file with fixed content, use L</guestfs_write>.  To create "
-"a file of all zeroes, use L</guestfs_truncate_size> (sparse) or L</"
-"guestfs_fallocate64> (with all disk blocks allocated).  There are a variety "
-"of other functions for creating test files, for example L</guestfs_fill> and "
-"L</guestfs_fill_pattern>."
+"a file of all zeroes, use L</guestfs_truncate_size> (sparse) or "
+"L</guestfs_fallocate64> (with all disk blocks allocated).  There are a "
+"variety of other functions for creating test files, for example "
+"L</guestfs_fill> and L</guestfs_fill_pattern>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:290
 msgid ""
-"To upload a single file, use L</guestfs_upload>.  This call has no limits on "
-"file content or size (even files larger than 4 GB)."
+"To upload a single file, use L</guestfs_upload>.  This call has no limits on"
+" file content or size (even files larger than 4 GB)."
 msgstr ""
 
 #. type: textblock
@@ -34789,14 +34842,14 @@ msgstr ""
 #: ../src/guestfs.pod:295
 msgid ""
 "However the fastest way to upload I<large numbers of arbitrary files> is to "
-"turn them into a squashfs or CD ISO (see L<mksquashfs(8)> and L<mkisofs(8)"
-">), then attach this using L</guestfs_add_drive_ro>.  If you add the drive "
-"in a predictable way (eg. adding it last after all other drives) then you "
-"can get the device name from L</guestfs_list_devices> and mount it directly "
-"using L</guestfs_mount_ro>.  Note that squashfs images are sometimes non-"
-"portable between kernel versions, and they don't support labels or UUIDs.  "
-"If you want to pre-build an image or you need to mount it using a label or "
-"UUID, use an ISO image instead."
+"turn them into a squashfs or CD ISO (see L<mksquashfs(8)> and "
+"L<mkisofs(8)>), then attach this using L</guestfs_add_drive_ro>.  If you add"
+" the drive in a predictable way (eg. adding it last after all other drives) "
+"then you can get the device name from L</guestfs_list_devices> and mount it "
+"directly using L</guestfs_mount_ro>.  Note that squashfs images are "
+"sometimes non-portable between kernel versions, and they don't support "
+"labels or UUIDs.  If you want to pre-build an image or you need to mount it "
+"using a label or UUID, use an ISO image instead."
 msgstr ""
 
 #. type: =head2
@@ -34848,8 +34901,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:328
 msgid ""
-"Use L</guestfs_copy_file_to_device>, L</guestfs_copy_device_to_file>, or L</"
-"guestfs_copy_device_to_device>."
+"Use L</guestfs_copy_file_to_device>, L</guestfs_copy_device_to_file>, or "
+"L</guestfs_copy_device_to_device>."
 msgstr ""
 
 #. type: textblock
@@ -34915,12 +34968,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:359
 msgid ""
-"Calls like L</guestfs_upload>, L</guestfs_download>, L</guestfs_tar_in>, L</"
-"guestfs_tar_out> etc appear to only take filenames as arguments, so it "
+"Calls like L</guestfs_upload>, L</guestfs_download>, L</guestfs_tar_in>, "
+"L</guestfs_tar_out> etc appear to only take filenames as arguments, so it "
 "appears you can only upload and download to files.  However many Un*x-like "
-"hosts let you use the special device files C</dev/stdin>, C</dev/stdout>, C</"
-"dev/stderr> and C</dev/fd/N> to read and write from stdin, stdout, stderr, "
-"and arbitrary file descriptor N."
+"hosts let you use the special device files C</dev/stdin>, C</dev/stdout>, "
+"C</dev/stderr> and C</dev/fd/N> to read and write from stdin, stdout, "
+"stderr, and arbitrary file descriptor N."
 msgstr ""
 
 #. type: textblock
@@ -34981,7 +35034,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:390
 msgid ""
-"L</guestfs_find> and L</guestfs_find0> can be used to recursively list files."
+"L</guestfs_find> and L</guestfs_find0> can be used to recursively list "
+"files."
 msgstr ""
 
 #. type: =head2
@@ -35024,8 +35078,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:419
 msgid ""
-"The network may not be available unless you enable it (see L</"
-"guestfs_set_network>)."
+"The network may not be available unless you enable it (see "
+"L</guestfs_set_network>)."
 msgstr ""
 
 #. type: textblock
@@ -35063,16 +35117,16 @@ msgstr ""
 msgid ""
 "A secure alternative is to use libguestfs to install a \"firstboot\" script "
 "(a script which runs when the guest next boots normally), and to have this "
-"script run the commands you want in the normal context of the running guest, "
-"network security and so on.  For information about other security issues, "
+"script run the commands you want in the normal context of the running guest,"
+" network security and so on.  For information about other security issues, "
 "see L</SECURITY>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:455
 msgid ""
-"The two main API calls to run commands are L</guestfs_command> and L</"
-"guestfs_sh> (there are also variations)."
+"The two main API calls to run commands are L</guestfs_command> and "
+"L</guestfs_sh> (there are also variations)."
 msgstr ""
 
 #. type: textblock
@@ -35099,17 +35153,17 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:468
 msgid ""
-"The main Augeas calls are bound through the C<guestfs_aug_*> APIs.  We don't "
-"document Augeas itself here because there is excellent documentation on the "
-"L<http://augeas.net/> website."
+"The main Augeas calls are bound through the C<guestfs_aug_*> APIs.  We don't"
+" document Augeas itself here because there is excellent documentation on the"
+" L<http://augeas.net/> website."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:472
 msgid ""
-"If you don't want to use Augeas (you fool!) then try calling L</"
-"guestfs_read_lines> to get the file as a list of lines which you can iterate "
-"over."
+"If you don't want to use Augeas (you fool!) then try calling "
+"L</guestfs_read_lines> to get the file as a list of lines which you can "
+"iterate over."
 msgstr ""
 
 #. type: =head2
@@ -35204,16 +35258,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:525
 msgid ""
-"The default umask is C<022>, so files are created with modes such as C<0644> "
-"and directories with C<0755>."
+"The default umask is C<022>, so files are created with modes such as C<0644>"
+" and directories with C<0755>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:528
 msgid ""
 "There are two ways to avoid being affected by umask.  Either set umask to 0 "
-"(call C<guestfs_umask (g, 0)> early after launching).  Or call L</"
-"guestfs_chmod> after creating each file or directory."
+"(call C<guestfs_umask (g, 0)> early after launching).  Or call "
+"L</guestfs_chmod> after creating each file or directory."
 msgstr ""
 
 #. type: textblock
@@ -35224,8 +35278,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:536
 msgid ""
-"Libguestfs allows you to access Linux guests which have been encrypted using "
-"whole disk encryption that conforms to the Linux Unified Key Setup (LUKS) "
+"Libguestfs allows you to access Linux guests which have been encrypted using"
+" whole disk encryption that conforms to the Linux Unified Key Setup (LUKS) "
 "standard.  This includes nearly all whole disk encryption systems used by "
 "modern Linux guests."
 msgstr ""
@@ -35247,27 +35301,27 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:548
 msgid ""
-"Opening a LUKS device creates a new device mapper device called C</dev/"
-"mapper/mapname> (where C<mapname> is the string you supply to L</"
-"guestfs_luks_open>).  Reads and writes to this mapper device are decrypted "
-"from and encrypted to the underlying block device respectively."
+"Opening a LUKS device creates a new device mapper device called "
+"C</dev/mapper/mapname> (where C<mapname> is the string you supply to "
+"L</guestfs_luks_open>).  Reads and writes to this mapper device are "
+"decrypted from and encrypted to the underlying block device respectively."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:554
 msgid ""
-"LVM volume groups on the device can be made visible by calling L</"
-"guestfs_vgscan> followed by L</guestfs_vg_activate_all>.  The logical volume"
-"(s) can now be mounted in the usual way."
+"LVM volume groups on the device can be made visible by calling "
+"L</guestfs_vgscan> followed by L</guestfs_vg_activate_all>.  The logical "
+"volume(s) can now be mounted in the usual way."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:558
 msgid ""
-"Use the reverse process to close a LUKS device.  Unmount any logical volumes "
-"on it, deactivate the volume groups by caling C<guestfs_vg_activate (g, 0, "
-"[\"/dev/VG\"])>.  Then close the mapper device by calling L</"
-"guestfs_luks_close> on the C</dev/mapper/mapname> device (I<not> the "
+"Use the reverse process to close a LUKS device.  Unmount any logical volumes"
+" on it, deactivate the volume groups by caling C<guestfs_vg_activate (g, 0, "
+"[\"/dev/VG\"])>.  Then close the mapper device by calling "
+"L</guestfs_luks_close> on the C</dev/mapper/mapname> device (I<not> the "
 "underlying encrypted block device)."
 msgstr ""
 
@@ -35280,24 +35334,24 @@ msgstr ""
 #: ../src/guestfs.pod:567
 msgid ""
 "Libguestfs has APIs for inspecting an unknown disk image to find out if it "
-"contains operating systems, an install CD or a live CD.  (These APIs used to "
-"be in a separate Perl-only library called L<Sys::Guestfs::Lib(3)> but since "
-"version 1.5.3 the most frequently used part of this library has been "
+"contains operating systems, an install CD or a live CD.  (These APIs used to"
+" be in a separate Perl-only library called L<Sys::Guestfs::Lib(3)> but since"
+" version 1.5.3 the most frequently used part of this library has been "
 "rewritten in C and moved into the core code)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:574
 msgid ""
-"Add all disks belonging to the unknown virtual machine and call L</"
-"guestfs_launch> in the usual way."
+"Add all disks belonging to the unknown virtual machine and call "
+"L</guestfs_launch> in the usual way."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:577
 msgid ""
-"Then call L</guestfs_inspect_os>.  This function uses other libguestfs calls "
-"and certain heuristics, and returns a list of operating systems that were "
+"Then call L</guestfs_inspect_os>.  This function uses other libguestfs calls"
+" and certain heuristics, and returns a list of operating systems that were "
 "found.  An empty list means none were found.  A single element is the root "
 "filesystem of the operating system.  For dual- or multi-boot guests, "
 "multiple roots can be returned, each one corresponding to a separate "
@@ -35310,9 +35364,9 @@ msgstr ""
 #: ../src/guestfs.pod:586
 msgid ""
 "For each root, you can then call various C<guestfs_inspect_get_*> functions "
-"to get additional details about that operating system.  For example, call L</"
-"guestfs_inspect_get_type> to return the string C<windows> or C<linux> for "
-"Windows and Linux-based operating systems respectively."
+"to get additional details about that operating system.  For example, call "
+"L</guestfs_inspect_get_type> to return the string C<windows> or C<linux> for"
+" Windows and Linux-based operating systems respectively."
 msgstr ""
 
 #. type: textblock
@@ -35320,8 +35374,8 @@ msgstr ""
 msgid ""
 "Un*x-like and Linux-based operating systems usually consist of several "
 "filesystems which are mounted at boot time (for example, a separate boot "
-"partition mounted on C</boot>).  The inspection rules are able to detect how "
-"filesystems correspond to mount points.  Call "
+"partition mounted on C</boot>).  The inspection rules are able to detect how"
+" filesystems correspond to mount points.  Call "
 "C<guestfs_inspect_get_mountpoints> to get this mapping.  It might return a "
 "hash table like this example:"
 msgstr ""
@@ -35346,16 +35400,17 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:606
 msgid ""
-"Be careful to mount filesystems in the right order (eg. C</> before C</"
-"usr>).  Sorting the keys of the hash by length, shortest first, should work."
+"Be careful to mount filesystems in the right order (eg. C</> before "
+"C</usr>).  Sorting the keys of the hash by length, shortest first, should "
+"work."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:610
 msgid ""
 "Inspection currently only works for some common operating systems.  "
-"Contributors are welcome to send patches for other operating systems that we "
-"currently cannot detect."
+"Contributors are welcome to send patches for other operating systems that we"
+" currently cannot detect."
 msgstr ""
 
 #. type: textblock
@@ -35373,10 +35428,10 @@ msgid ""
 "inspection and caches the results in the guest handle.  Subsequent calls to "
 "C<guestfs_inspect_get_*> return this cached information, but I<do not> re-"
 "read the disks.  If you change the content of the guest disks, you can redo "
-"inspection by calling L</guestfs_inspect_os> again.  (L</"
-"guestfs_inspect_list_applications> works a little differently from the other "
-"calls and does read the disks.  See documentation for that function for "
-"details)."
+"inspection by calling L</guestfs_inspect_os> again.  "
+"(L</guestfs_inspect_list_applications> works a little differently from the "
+"other calls and does read the disks.  See documentation for that function "
+"for details)."
 msgstr ""
 
 #. type: =head3
@@ -35403,16 +35458,17 @@ msgstr ""
 #: ../src/guestfs.pod:636
 msgid ""
 "Further information is available about the operating system that can be "
-"installed using the regular inspection APIs like L</"
-"guestfs_inspect_get_product_name>, L</guestfs_inspect_get_major_version> etc."
+"installed using the regular inspection APIs like "
+"L</guestfs_inspect_get_product_name>, L</guestfs_inspect_get_major_version> "
+"etc."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:641
 msgid ""
 "Some additional information specific to installer disks is also available "
-"from the L</guestfs_inspect_is_live>, L</guestfs_inspect_is_netinst> and L</"
-"guestfs_inspect_is_multipart> calls."
+"from the L</guestfs_inspect_is_live>, L</guestfs_inspect_is_netinst> and "
+"L</guestfs_inspect_is_multipart> calls."
 msgstr ""
 
 #. type: =head2
@@ -35423,8 +35479,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:648
 msgid ""
-"Libguestfs can mount NTFS partitions.  It does this using the L<http://www."
-"ntfs-3g.org/> driver."
+"Libguestfs can mount NTFS partitions.  It does this using the L<http://www"
+".ntfs-3g.org/> driver."
 msgstr ""
 
 #. type: =head3
@@ -35437,9 +35493,9 @@ msgstr ""
 msgid ""
 "DOS and Windows still use drive letters, and the filesystems are always "
 "treated as case insensitive by Windows itself, and therefore you might find "
-"a Windows configuration file referring to a path like C<c:\\windows"
-"\\system32>.  When the filesystem is mounted in libguestfs, that directory "
-"might be referred to as C</WINDOWS/System32>."
+"a Windows configuration file referring to a path like "
+"C<c:\\windows\\system32>.  When the filesystem is mounted in libguestfs, "
+"that directory might be referred to as C</WINDOWS/System32>."
 msgstr ""
 
 #. type: textblock
@@ -35460,8 +35516,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:666
 msgid ""
-"To resolve the case insensitivity of paths, call L</"
-"guestfs_case_sensitive_path>."
+"To resolve the case insensitivity of paths, call "
+"L</guestfs_case_sensitive_path>."
 msgstr ""
 
 #. type: =head3
@@ -35476,8 +35532,8 @@ msgid ""
 "files, through the library C<hivex> which is part of the libguestfs project "
 "although ships as a separate tarball.  You have to locate and download the "
 "hive file(s) yourself, and then pass them to C<hivex> functions.  See also "
-"the programs L<hivexml(1)>, L<hivexsh(1)>, L<hivexregedit(1)> and L<virt-win-"
-"reg(1)> for more help on this issue."
+"the programs L<hivexml(1)>, L<hivexsh(1)>, L<hivexregedit(1)> and L<virt-"
+"win-reg(1)> for more help on this issue."
 msgstr ""
 
 #. type: =head3
@@ -35513,8 +35569,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:694
 msgid ""
-"Instead if you encounter a symbolic link on an ntfs-3g filesystem, use L</"
-"guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "
+"Instead if you encounter a symbolic link on an ntfs-3g filesystem, use "
+"L</guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "
 "attribute, and read the raw reparse data from that (you can find the format "
 "documented in various places around the web)."
 msgstr ""
@@ -35553,8 +35609,8 @@ msgstr ""
 #: ../src/guestfs.pod:711
 msgid ""
 "The API is broadly identical in all supported languages.  This means that "
-"the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)> "
-"in Perl, C<g.add_drive_ro(file)> in Python, and C<g#add_drive_ro file> in "
+"the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)>"
+" in Perl, C<g.add_drive_ro(file)> in Python, and C<g#add_drive_ro file> in "
 "OCaml.  In other words, a straightforward, predictable isomorphism between "
 "each language."
 msgstr ""
@@ -35562,8 +35618,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:717
 msgid ""
-"Error messages are automatically transformed into exceptions if the language "
-"supports it."
+"Error messages are automatically transformed into exceptions if the language"
+" supports it."
 msgstr ""
 
 #. type: textblock
@@ -35718,8 +35774,8 @@ msgstr ""
 msgid ""
 "Since we developed libguestfs and the associated tools, there are several "
 "things we would have designed differently, but are now stuck with for "
-"backwards compatibility or other reasons.  If there is ever a libguestfs 2.0 "
-"release, you can expect these to change.  Beware of them."
+"backwards compatibility or other reasons.  If there is ever a libguestfs 2.0"
+" release, you can expect these to change.  Beware of them."
 msgstr ""
 
 #. type: =item
@@ -35754,7 +35810,8 @@ msgstr ""
 #: ../src/guestfs.pod:806
 msgid ""
 "to have the unmount/sync done automatically for you when the handle 'g' is "
-"closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> q.v.)"
+"closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> "
+"q.v.)"
 msgstr ""
 
 #. type: textblock
@@ -35788,8 +35845,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:823
 msgid ""
-"If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly.  "
-"However C<-o sync> does not add any reliability benefit, but does have a "
+"If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly."
+"  However C<-o sync> does not add any reliability benefit, but does have a "
 "very large performance impact."
 msgstr ""
 
@@ -35821,8 +35878,8 @@ msgstr ""
 #: ../src/guestfs.pod:837
 msgid ""
 "Note that many filesystems change the disk when you just mount and unmount, "
-"even if you didn't perform any writes.  You need to use L</"
-"guestfs_add_drive_ro> to guarantee that the disk is not changed."
+"even if you didn't perform any writes.  You need to use "
+"L</guestfs_add_drive_ro> to guarantee that the disk is not changed."
 msgstr ""
 
 #. type: =item
@@ -35834,10 +35891,10 @@ msgstr ""
 #: ../src/guestfs.pod:843
 msgid ""
 "C<guestfish disk.img> doesn't do what people expect (open C<disk.img> for "
-"examination).  It tries to run a guestfish command C<disk.img> which doesn't "
-"exist, so it fails.  In earlier versions of guestfish the error message was "
-"also unintuitive, but we have corrected this since.  Like the Bourne shell, "
-"we should have used C<guestfish -c command> to run commands."
+"examination).  It tries to run a guestfish command C<disk.img> which doesn't"
+" exist, so it fails.  In earlier versions of guestfish the error message was"
+" also unintuitive, but we have corrected this since.  Like the Bourne shell,"
+" we should have used C<guestfish -c command> to run commands."
 msgstr ""
 
 #. type: =item
@@ -35892,9 +35949,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:873
 msgid ""
-"There is a subtle ambiguity in the API between a device name (eg. C</dev/"
-"sdb2>) and a similar pathname.  A file might just happen to be called "
-"C<sdb2> in the directory C</dev> (consider some non-Unix VM image)."
+"There is a subtle ambiguity in the API between a device name (eg. "
+"C</dev/sdb2>) and a similar pathname.  A file might just happen to be called"
+" C<sdb2> in the directory C</dev> (consider some non-Unix VM image)."
 msgstr ""
 
 #. type: textblock
@@ -35972,8 +36029,8 @@ msgstr ""
 #: ../src/guestfs.pod:914
 msgid ""
 "Therefore you should be aware that any key parameter you pass to libguestfs "
-"might end up being written out to the swap partition.  If this is a concern, "
-"scrub the swap partition or don't use libguestfs on encrypted devices."
+"might end up being written out to the swap partition.  If this is a concern,"
+" scrub the swap partition or don't use libguestfs on encrypted devices."
 msgstr ""
 
 #. type: =head2
@@ -35991,9 +36048,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:924
 msgid ""
-"Only use the handle from a single thread.  Either use the handle exclusively "
-"from one thread, or provide your own mutex so that two threads cannot issue "
-"calls on the same handle at the same time."
+"Only use the handle from a single thread.  Either use the handle exclusively"
+" from one thread, or provide your own mutex so that two threads cannot issue"
+" calls on the same handle at the same time."
 msgstr ""
 
 #. type: textblock
@@ -36018,15 +36075,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:936
 msgid ""
-"By default it looks for these in the directory C<$libdir/guestfs> (eg. C</"
-"usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."
+"By default it looks for these in the directory C<$libdir/guestfs> (eg. "
+"C</usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:939
 msgid ""
-"Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH> "
-"to change the directories that libguestfs will search in.  The value is a "
+"Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH>"
+" to change the directories that libguestfs will search in.  The value is a "
 "colon-separated list of paths.  The current directory is I<not> searched "
 "unless the path contains an empty element or C<.>.  For example "
 "C<LIBGUESTFS_PATH=:/usr/lib/guestfs> would search the current directory and "
@@ -36041,8 +36098,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:948
 msgid ""
-"If you want to compile your own qemu, run qemu from a non-standard location, "
-"or pass extra arguments to qemu, then you can write a shell-script wrapper "
+"If you want to compile your own qemu, run qemu from a non-standard location,"
+" or pass extra arguments to qemu, then you can write a shell-script wrapper "
 "around qemu."
 msgstr ""
 
@@ -36058,8 +36115,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:957
 msgid ""
-"Here is an example of a wrapper, where I have built my own copy of qemu from "
-"source:"
+"Here is an example of a wrapper, where I have built my own copy of qemu from"
+" source:"
 msgstr ""
 
 #. type: verbatim
@@ -36099,9 +36156,9 @@ msgstr ""
 #: ../src/guestfs.pod:973
 msgid ""
 "Wrappers can also be used to edit the options passed to qemu.  In the "
-"following example, the C<-machine ...> option (C<-machine> and the following "
-"argument) are removed from the command line and replaced with C<-machine pc,"
-"accel=tcg>.  The while loop iterates over the options until it finds the "
+"following example, the C<-machine ...> option (C<-machine> and the following"
+" argument) are removed from the command line and replaced with C<-machine "
+"pc,accel=tcg>.  The while loop iterates over the options until it finds the "
 "right one to remove, putting the remaining options into the C<args> array."
 msgstr ""
 
@@ -36160,15 +36217,15 @@ msgstr ""
 #: ../src/guestfs.pod:1007
 msgid ""
 "By calling L</guestfs_set_attach_method> you can change how the library "
-"connects to the C<guestfsd> daemon in L</guestfs_launch> (read L</"
-"ARCHITECTURE> for some background)."
+"connects to the C<guestfsd> daemon in L</guestfs_launch> (read "
+"L</ARCHITECTURE> for some background)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1011
 msgid ""
-"The normal attach method is C<appliance>, where a small appliance is created "
-"containing the daemon, and then the library connects to this."
+"The normal attach method is C<appliance>, where a small appliance is created"
+" containing the daemon, and then the library connects to this."
 msgstr ""
 
 #. type: textblock
@@ -36252,8 +36309,8 @@ msgid ""
 "We guarantee the libguestfs ABI (binary interface), for public, high-level "
 "actions as outlined in this section.  Although we will deprecate some "
 "actions, for example if they get replaced by newer calls, we will keep the "
-"old actions forever.  This allows you the developer to program in confidence "
-"against the libguestfs API."
+"old actions forever.  This allows you the developer to program in confidence"
+" against the libguestfs API."
 msgstr ""
 
 #. type: =head2
@@ -36266,13 +36323,14 @@ msgstr ""
 msgid ""
 "In the kernel there is now quite a profusion of schemata for naming block "
 "devices (in this context, by I<block device> I mean a physical or virtual "
-"hard drive).  The original Linux IDE driver used names starting with C</dev/"
-"hd*>.  SCSI devices have historically used a different naming scheme, C</dev/"
-"sd*>.  When the Linux kernel I<libata> driver became a popular replacement "
-"for the old IDE driver (particularly for SATA devices) those devices also "
-"used the C</dev/sd*> scheme.  Additionally we now have virtual machines with "
-"paravirtualized drivers.  This has created several different naming systems, "
-"such as C</dev/vd*> for virtio disks and C</dev/xvd*> for Xen PV disks."
+"hard drive).  The original Linux IDE driver used names starting with "
+"C</dev/hd*>.  SCSI devices have historically used a different naming scheme,"
+" C</dev/sd*>.  When the Linux kernel I<libata> driver became a popular "
+"replacement for the old IDE driver (particularly for SATA devices) those "
+"devices also used the C</dev/sd*> scheme.  Additionally we now have virtual "
+"machines with paravirtualized drivers.  This has created several different "
+"naming systems, such as C</dev/vd*> for virtio disks and C</dev/xvd*> for "
+"Xen PV disks."
 msgstr ""
 
 #. type: textblock
@@ -36295,16 +36353,16 @@ msgstr ""
 #: ../src/guestfs.pod:1084
 msgid ""
 "Therefore libguestfs defines C</dev/sd*> as the I<standard naming scheme>.  "
-"Internally C</dev/sd*> names are translated, if necessary, to other names as "
-"required.  For example, under RHEL 5 which uses the C</dev/hd*> scheme, any "
-"device parameter C</dev/sda2> is translated to C</dev/hda2> transparently."
+"Internally C</dev/sd*> names are translated, if necessary, to other names as"
+" required.  For example, under RHEL 5 which uses the C</dev/hd*> scheme, any"
+" device parameter C</dev/sda2> is translated to C</dev/hda2> transparently."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1090
 msgid ""
-"Note that this I<only> applies to parameters.  The L</guestfs_list_devices>, "
-"L</guestfs_list_partitions> and similar calls return the true names of the "
+"Note that this I<only> applies to parameters.  The L</guestfs_list_devices>,"
+" L</guestfs_list_partitions> and similar calls return the true names of the "
 "devices and partitions as known to the appliance."
 msgstr ""
 
@@ -36316,9 +36374,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1097
 msgid ""
-"Usually this translation is transparent.  However in some (very rare)  cases "
-"you may need to know the exact algorithm.  Such cases include where you use "
-"L</guestfs_config> to add a mixture of virtio and IDE devices to the qemu-"
+"Usually this translation is transparent.  However in some (very rare)  cases"
+" you may need to know the exact algorithm.  Such cases include where you use"
+" L</guestfs_config> to add a mixture of virtio and IDE devices to the qemu-"
 "based appliance, so have a mixture of C</dev/sd*> and C</dev/vd*> devices."
 msgstr ""
 
@@ -36326,8 +36384,8 @@ msgstr ""
 #: ../src/guestfs.pod:1103
 msgid ""
 "The algorithm is applied only to I<parameters> which are known to be either "
-"device or partition names.  Return values from functions such as L</"
-"guestfs_list_devices> are never changed."
+"device or partition names.  Return values from functions such as "
+"L</guestfs_list_devices> are never changed."
 msgstr ""
 
 #. type: textblock
@@ -36381,8 +36439,8 @@ msgstr ""
 #: ../src/guestfs.pod:1140
 msgid ""
 "Although the standard naming scheme and automatic translation is useful for "
-"simple programs and guestfish scripts, for larger programs it is best not to "
-"rely on this mechanism."
+"simple programs and guestfish scripts, for larger programs it is best not to"
+" rely on this mechanism."
 msgstr ""
 
 #. type: textblock
@@ -36514,10 +36572,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1236
 msgid ""
-"The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a "
-"defined upper message size.  However a program that uses libguestfs must "
-"also take care - for example you can write a program that downloads a binary "
-"from a disk image and executes it locally, and no amount of protocol "
+"The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a"
+" defined upper message size.  However a program that uses libguestfs must "
+"also take care - for example you can write a program that downloads a binary"
+" from a disk image and executes it locally, and no amount of protocol "
 "security will save you from the consequences."
 msgstr ""
 
@@ -36539,8 +36597,8 @@ msgstr ""
 #: ../src/guestfs.pod:1250
 msgid ""
 "Guest configuration may be altered in unusual ways by the administrator of "
-"the virtual machine, and may not reflect reality (particularly for untrusted "
-"or actively malicious guests).  For example we parse the hostname from "
+"the virtual machine, and may not reflect reality (particularly for untrusted"
+" or actively malicious guests).  For example we parse the hostname from "
 "configuration files like C</etc/sysconfig/network> that we find in the "
 "guest, but the guest administrator can easily manipulate these files to "
 "provide the wrong hostname."
@@ -36552,8 +36610,8 @@ msgid ""
 "The inspection API parses guest configuration using two external libraries: "
 "Augeas (Linux configuration) and hivex (Windows Registry).  Both are "
 "designed to be robust in the face of malicious data, although denial of "
-"service attacks are still possible, for example with oversized configuration "
-"files."
+"service attacks are still possible, for example with oversized configuration"
+" files."
 msgstr ""
 
 #. type: =head2
@@ -36592,8 +36650,8 @@ msgstr ""
 #: ../src/guestfs.pod:1279
 msgid ""
 "A raw disk image is just the raw bytes, there is no header.  Other disk "
-"images like qcow2 contain a special header.  Qemu deals with this by looking "
-"for one of the known headers, and if none is found then assuming the disk "
+"images like qcow2 contain a special header.  Qemu deals with this by looking"
+" for one of the known headers, and if none is found then assuming the disk "
 "image must be raw."
 msgstr ""
 
@@ -36602,8 +36660,8 @@ msgstr ""
 msgid ""
 "This allows a guest which has been given a raw disk image to write some "
 "other header.  At next boot (or when the disk image is accessed by "
-"libguestfs) qemu would do autodetection and think the disk image format was, "
-"say, qcow2 based on the header written by the guest."
+"libguestfs) qemu would do autodetection and think the disk image format was,"
+" say, qcow2 based on the header written by the guest."
 msgstr ""
 
 #. type: textblock
@@ -36680,8 +36738,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1332
 msgid ""
-"For information on using multiple handles and threads, see the section L</"
-"MULTIPLE HANDLES AND MULTIPLE THREADS> above."
+"For information on using multiple handles and threads, see the section "
+"L</MULTIPLE HANDLES AND MULTIPLE THREADS> above."
 msgstr ""
 
 #. type: =head2
@@ -36705,8 +36763,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1341
 msgid ""
-"On success this returns a non-NULL pointer to a handle.  On error it returns "
-"NULL."
+"On success this returns a non-NULL pointer to a handle.  On error it returns"
+" NULL."
 msgstr ""
 
 #. type: textblock
@@ -36725,8 +36783,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1350
 msgid ""
-"You may also want to configure error handling for the handle.  See the L</"
-"ERROR HANDLING> section below."
+"You may also want to configure error handling for the handle.  See the "
+"L</ERROR HANDLING> section below."
 msgstr ""
 
 #. type: =head2
@@ -36751,8 +36809,8 @@ msgstr ""
 #: ../src/guestfs.pod:1359
 msgid ""
 "If autosync was set on the handle and the handle was launched, then this "
-"implicitly calls various functions to unmount filesystems and sync the "
-"disk.  See L</guestfs_set_autosync> for more details."
+"implicitly calls various functions to unmount filesystems and sync the disk."
+"  See L</guestfs_set_autosync> for more details."
 msgstr ""
 
 #. type: textblock
@@ -36783,9 +36841,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1374
 msgid ""
-"You can get at the additional information about the last error on the handle "
-"by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by setting "
-"up an error handler with L</guestfs_set_error_handler>."
+"You can get at the additional information about the last error on the handle"
+" by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by "
+"setting up an error handler with L</guestfs_set_error_handler>."
 msgstr ""
 
 #. type: textblock
@@ -36849,19 +36907,19 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1407
 msgid ""
-"Out of memory errors are handled differently.  The default action is to call "
-"L<abort(3)>.  If this is undesirable, then you can set a handler using L</"
-"guestfs_set_out_of_memory_handler>."
+"Out of memory errors are handled differently.  The default action is to call"
+" L<abort(3)>.  If this is undesirable, then you can set a handler using "
+"L</guestfs_set_out_of_memory_handler>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1411
 msgid ""
 "L</guestfs_create> returns C<NULL> if the handle cannot be created, and "
-"because there is no handle if this happens there is no way to get additional "
-"error information.  However L</guestfs_create> is supposed to be a "
-"lightweight operation which can only fail because of insufficient memory (it "
-"returns NULL in this case)."
+"because there is no handle if this happens there is no way to get additional"
+" error information.  However L</guestfs_create> is supposed to be a "
+"lightweight operation which can only fail because of insufficient memory (it"
+" returns NULL in this case)."
 msgstr ""
 
 #. type: =head2
@@ -36880,15 +36938,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1421
 msgid ""
-"This returns the last error message that happened on C<g>.  If there has not "
-"been an error since the handle was created, then this returns C<NULL>."
+"This returns the last error message that happened on C<g>.  If there has not"
+" been an error since the handle was created, then this returns C<NULL>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1425
 msgid ""
-"The lifetime of the returned string is until the next error occurs, or L</"
-"guestfs_close> is called."
+"The lifetime of the returned string is until the next error occurs, or "
+"L</guestfs_close> is called."
 msgstr ""
 
 #. type: =head2
@@ -36946,8 +37004,8 @@ msgid ""
 "Libguestfs tries to convert the errno from inside the applicance into a "
 "corresponding errno for the caller (not entirely trivial: the appliance "
 "might be running a completely different operating system from the library "
-"and error numbers are not standardized across Un*xen).  If this could not be "
-"done, then the error is translated to C<EINVAL>.  In practice this should "
+"and error numbers are not standardized across Un*xen).  If this could not be"
+" done, then the error is translated to C<EINVAL>.  In practice this should "
 "only happen in very rare circumstances."
 msgstr ""
 
@@ -37119,8 +37177,8 @@ msgstr ""
 #: ../src/guestfs.pod:1539
 msgid ""
 "In L<guestfish(3)> there is a handy interactive command C<supported> which "
-"prints out the available groups and whether they are supported by this build "
-"of libguestfs.  Note however that you have to do C<run> first."
+"prints out the available groups and whether they are supported by this build"
+" of libguestfs.  Note however that you have to do C<run> first."
 msgstr ""
 
 #. type: =head2
@@ -37152,8 +37210,8 @@ msgstr ""
 #: ../src/guestfs.pod:1553
 msgid ""
 "Before version 1.5.8, if you needed to test whether a single libguestfs "
-"function is available at compile time, we recommended using build tools such "
-"as autoconf or cmake.  For example in autotools you could use:"
+"function is available at compile time, we recommended using build tools such"
+" as autoconf or cmake.  For example in autotools you could use:"
 msgstr ""
 
 #. type: verbatim
@@ -37168,8 +37226,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1561
 msgid ""
-"which would result in C<HAVE_GUESTFS_DD> being either defined or not defined "
-"in your program."
+"which would result in C<HAVE_GUESTFS_DD> being either defined or not defined"
+" in your program."
 msgstr ""
 
 #. type: =head2
@@ -37277,9 +37335,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1620
 msgid ""
-"A recent feature of the API is the introduction of calls which take optional "
-"arguments.  In C these are declared 3 ways.  The main way is as a call which "
-"takes variable arguments (ie. C<...>), as in this example:"
+"A recent feature of the API is the introduction of calls which take optional"
+" arguments.  In C these are declared 3 ways.  The main way is as a call "
+"which takes variable arguments (ie. C<...>), as in this example:"
 msgstr ""
 
 #. type: verbatim
@@ -37351,8 +37409,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1650
 msgid ""
-"The second variant has the same name with the suffix C<_va>, which works the "
-"same way but takes a C<va_list>.  See the C manual for details.  For the "
+"The second variant has the same name with the suffix C<_va>, which works the"
+" same way but takes a C<va_list>.  See the C manual for details.  For the "
 "example function, this is declared:"
 msgstr ""
 
@@ -37423,7 +37481,8 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1691
-msgid "The C<_BITMASK> suffix on each option name when specifying the bitmask."
+msgid ""
+"The C<_BITMASK> suffix on each option name when specifying the bitmask."
 msgstr ""
 
 #. type: textblock
@@ -37488,10 +37547,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1732
 msgid ""
-"In the current implementation, events are only generated synchronously: that "
-"means that events (and hence callbacks) can only happen while you are in the "
-"middle of making another libguestfs call.  The callback is called in the "
-"same thread."
+"In the current implementation, events are only generated synchronously: that"
+" means that events (and hence callbacks) can only happen while you are in "
+"the middle of making another libguestfs call.  The callback is called in the"
+" same thread."
 msgstr ""
 
 #. type: textblock
@@ -37522,8 +37581,8 @@ msgstr ""
 #: ../src/guestfs.pod:1751
 msgid ""
 "Note that libguestfs installs an L<atexit(3)> handler to try to clean up "
-"handles that are open when the program exits.  This means that this callback "
-"might be called indirectly from L<exit(3)>, which can cause unexpected "
+"handles that are open when the program exits.  This means that this callback"
+" might be called indirectly from L<exit(3)>, which can cause unexpected "
 "problems in higher-level languages (eg. if your HLL interpreter has already "
 "been cleaned up by the time this is called, and if your callback then jumps "
 "into some HLL function)."
@@ -37592,9 +37651,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1791
 msgid ""
-"The units of C<total> are not defined, although for some operations C<total> "
-"may relate in some way to the amount of data to be transferred (eg. in bytes "
-"or megabytes), and C<position> may be the portion which has been transferred."
+"The units of C<total> are not defined, although for some operations C<total>"
+" may relate in some way to the amount of data to be transferred (eg. in "
+"bytes or megabytes), and C<position> may be the portion which has been "
+"transferred."
 msgstr ""
 
 #. type: textblock
@@ -37626,16 +37686,16 @@ msgstr ""
 #: ../src/guestfs.pod:1815
 msgid ""
 "This is to simplify caller code, so callers can easily set the progress "
-"indicator to \"100%\" at the end of the operation, without requiring special "
-"code to detect this case."
+"indicator to \"100%\" at the end of the operation, without requiring special"
+" code to detect this case."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1821
 msgid ""
 "For some calls we are unable to estimate the progress of the call, but we "
-"can still generate progress messages to indicate activity.  This is known as "
-"\"pulse mode\", and is directly supported by certain progress bar "
+"can still generate progress messages to indicate activity.  This is known as"
+" \"pulse mode\", and is directly supported by certain progress bar "
 "implementations (eg. GtkProgressBar)."
 msgstr ""
 
@@ -37676,15 +37736,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1846
 msgid ""
-"The callback function is called whenever a log message is generated by qemu, "
-"the appliance kernel, guestfsd (daemon), or utility programs."
+"The callback function is called whenever a log message is generated by qemu,"
+" the appliance kernel, guestfsd (daemon), or utility programs."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1849
 msgid ""
-"If the verbose flag (L</guestfs_set_verbose>) is set before launch (L</"
-"guestfs_launch>) then additional debug messages are generated."
+"If the verbose flag (L</guestfs_set_verbose>) is set before launch "
+"(L</guestfs_launch>) then additional debug messages are generated."
 msgstr ""
 
 #. type: textblock
@@ -37722,8 +37782,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1874
 msgid ""
-"The callback function is called whenever a trace message is generated.  This "
-"only applies if the trace flag (L</guestfs_set_trace>) is set."
+"The callback function is called whenever a trace message is generated.  This"
+" only applies if the trace flag (L</guestfs_set_trace>) is set."
 msgstr ""
 
 #. type: textblock
@@ -37787,8 +37847,8 @@ msgstr ""
 #: ../src/guestfs.pod:1909
 msgid ""
 "For example, to register for all log message events, you could call this "
-"function with the bitmask C<GUESTFS_EVENT_APPLIANCE|GUESTFS_EVENT_LIBRARY>.  "
-"To register a single callback for all possible classes of events, use "
+"function with the bitmask C<GUESTFS_EVENT_APPLIANCE|GUESTFS_EVENT_LIBRARY>."
+"  To register a single callback for all possible classes of events, use "
 "C<GUESTFS_EVENT_ALL>."
 msgstr ""
 
@@ -37800,8 +37860,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1917
 msgid ""
-"C<opaque> is an opaque pointer which is passed to the callback.  You can use "
-"it for any purpose."
+"C<opaque> is an opaque pointer which is passed to the callback.  You can use"
+" it for any purpose."
 msgstr ""
 
 #. type: textblock
@@ -37814,8 +37874,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1923
 msgid ""
-"If there is an error, this function returns C<-1>, and sets the error in the "
-"handle in the usual way (see L</guestfs_last_error> etc.)"
+"If there is an error, this function returns C<-1>, and sets the error in the"
+" handle in the usual way (see L</guestfs_last_error> etc.)"
 msgstr ""
 
 #. type: textblock
@@ -37849,8 +37909,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1937
 msgid ""
-"Delete a callback that was previously registered.  C<event_handle> should be "
-"the integer that was returned by a previous call to "
+"Delete a callback that was previously registered.  C<event_handle> should be"
+" the integer that was returned by a previous call to "
 "C<guestfs_set_event_callback> on the same handle."
 msgstr ""
 
@@ -37891,9 +37951,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1959
 msgid ""
-"The remaining parameters contain the event payload (if any).  Each event may "
-"contain a payload, which usually relates to the event class, but for future "
-"proofing your code should be written to handle any payload for any event "
+"The remaining parameters contain the event payload (if any).  Each event may"
+" contain a payload, which usually relates to the event class, but for future"
+" proofing your code should be written to handle any payload for any event "
 "class."
 msgstr ""
 
@@ -38021,17 +38081,17 @@ msgstr ""
 #: ../src/guestfs.pod:2027
 msgid ""
 "Unlike most other libguestfs calls, this function is signal safe and thread "
-"safe.  You can call it from a signal handler or from another thread, without "
-"needing to do any locking."
+"safe.  You can call it from a signal handler or from another thread, without"
+" needing to do any locking."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2031
 msgid ""
 "The transfer that was in progress (if there is one) will stop shortly "
-"afterwards, and will return an error.  The errno (see L</"
-"guestfs_last_errno>) is set to C<EINTR>, so you can test for this to find "
-"out if the operation was cancelled or failed because of another error."
+"afterwards, and will return an error.  The errno (see "
+"L</guestfs_last_errno>) is set to C<EINTR>, so you can test for this to find"
+" out if the operation was cancelled or failed because of another error."
 msgstr ""
 
 #. type: textblock
@@ -38044,7 +38104,8 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2041
-msgid "There are two common places that you might call C<guestfs_user_cancel>."
+msgid ""
+"There are two common places that you might call C<guestfs_user_cancel>."
 msgstr ""
 
 #. type: textblock
@@ -38163,8 +38224,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2094
 msgid ""
-"C<guestfs_first_private> returns the first key, pointer pair (\"first\" does "
-"not have any particular meaning -- keys are not returned in any defined "
+"C<guestfs_first_private> returns the first key, pointer pair (\"first\" does"
+" not have any particular meaning -- keys are not returned in any defined "
 "order).  A pointer to the key is returned in C<*key_rtn> and the "
 "corresponding data pointer is returned from the function.  C<NULL> is "
 "returned if there are no keys stored in the handle."
@@ -38246,8 +38307,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2146
 msgid ""
-"More commonly you are only interested in keys that begin with an application-"
-"specific prefix C<foo_>.  Modify the loop like so:"
+"More commonly you are only interested in keys that begin with an "
+"application-specific prefix C<foo_>.  Modify the loop like so:"
 msgstr ""
 
 #. type: verbatim
@@ -38346,8 +38407,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2199
 msgid ""
-"This script contains examples of displaying both the static markers and some "
-"ordinary C entry points:"
+"This script contains examples of displaying both the static markers and some"
+" ordinary C entry points:"
 msgstr ""
 
 #. type: verbatim
@@ -38466,8 +38527,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2256
 msgid ""
-"<!-- old anchor for the next section --> <a name="
-"\"state_machine_and_low_level_event_api\"/>"
+"<!-- old anchor for the next section --> <a "
+"name=\"state_machine_and_low_level_event_api\"/>"
 msgstr ""
 
 #. type: =head1
@@ -38512,8 +38573,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2287
 msgid ""
-"The library, linked to the main program, creates the child process and hence "
-"the appliance in the L</guestfs_launch> function."
+"The library, linked to the main program, creates the child process and hence"
+" the appliance in the L</guestfs_launch> function."
 msgstr ""
 
 #. type: textblock
@@ -38522,8 +38583,8 @@ msgid ""
 "Inside the appliance is a Linux kernel and a complete stack of userspace "
 "tools (such as LVM and ext2 programs) and a small controlling daemon called "
 "L</guestfsd>.  The library talks to L</guestfsd> using remote procedure "
-"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs "
-"API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
+"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs"
+" API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
 "attached to the qemu process which translates device access by the "
 "appliance's Linux kernel into accesses to the image."
 msgstr ""
@@ -38531,8 +38592,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2299
 msgid ""
-"A common misunderstanding is that the appliance \"is\" the virtual machine.  "
-"Although the disk image you are attached to might also be used by some "
+"A common misunderstanding is that the appliance \"is\" the virtual machine."
+"  Although the disk image you are attached to might also be used by some "
 "virtual machine, libguestfs doesn't know or care about this.  (But you will "
 "care if both libguestfs's qemu process and your virtual machine are trying "
 "to update the disk image at the same time, since these usually results in "
@@ -38580,9 +38641,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2332
 msgid ""
-"The normal transitions are (1) CONFIG (when the handle is created, but there "
-"is no child process), (2) LAUNCHING (when the child process is booting up), "
-"(3) alternating between READY and BUSY as commands are issued to, and "
+"The normal transitions are (1) CONFIG (when the handle is created, but there"
+" is no child process), (2) LAUNCHING (when the child process is booting up),"
+" (3) alternating between READY and BUSY as commands are issued to, and "
 "carried out by, the child process."
 msgstr ""
 
@@ -38590,8 +38651,8 @@ msgstr ""
 #: ../src/guestfs.pod:2337
 msgid ""
 "The guest may be killed by L</guestfs_kill_subprocess>, or may die "
-"asynchronously at any time (eg. due to some internal error), and that causes "
-"the state to transition back to CONFIG."
+"asynchronously at any time (eg. due to some internal error), and that causes"
+" the state to transition back to CONFIG."
 msgstr ""
 
 #. type: textblock
@@ -38614,8 +38675,8 @@ msgstr ""
 #: ../src/guestfs.pod:2350
 msgid ""
 "API actions such as L</guestfs_mount> can only be issued when in the READY "
-"state.  These API calls block waiting for the command to be carried out (ie. "
-"the state to transition to BUSY and then back to READY).  There are no non-"
+"state.  These API calls block waiting for the command to be carried out (ie."
+" the state to transition to BUSY and then back to READY).  There are no non-"
 "blocking versions, and no way to issue more than one command per handle at "
 "the same time."
 msgstr ""
@@ -38668,8 +38729,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2378
 msgid ""
-"The appliance is cached in C</var/tmp/.guestfs-E<lt>UIDE<gt>> (or in another "
-"directory if C<TMPDIR> is set)."
+"The appliance is cached in C</var/tmp/.guestfs-E<lt>UIDE<gt>> (or in another"
+" directory if C<TMPDIR> is set)."
 msgstr ""
 
 #. type: textblock
@@ -38697,16 +38758,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2391
 msgid ""
-"C<febootstrap-supermin-helper> builds a small initrd.  The initrd is not the "
-"appliance.  The purpose of the initrd is to load enough kernel modules in "
+"C<febootstrap-supermin-helper> builds a small initrd.  The initrd is not the"
+" appliance.  The purpose of the initrd is to load enough kernel modules in "
 "order that the appliance itself can be mounted and started."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2395
 msgid ""
-"The initrd is a cpio archive called C</var/tmp/.guestfs-E<lt>UIDE<gt>/"
-"initrd>."
+"The initrd is a cpio archive called "
+"C</var/tmp/.guestfs-E<lt>UIDE<gt>/initrd>."
 msgstr ""
 
 #. type: textblock
@@ -38793,8 +38854,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2435
 msgid ""
-"The appliance itself now initializes itself.  This involves starting certain "
-"processes like C<udev>, possibly printing some debug information, and "
+"The appliance itself now initializes itself.  This involves starting certain"
+" processes like C<udev>, possibly printing some debug information, and "
 "finally running the daemon (C<guestfsd>)."
 msgstr ""
 
@@ -38828,8 +38889,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2449
 msgid ""
-"The daemon connects to this port (and hence to the library) and sends a four "
-"byte message C<GUESTFS_LAUNCH_FLAG>, which initiates the communication "
+"The daemon connects to this port (and hence to the library) and sends a four"
+" byte message C<GUESTFS_LAUNCH_FLAG>, which initiates the communication "
 "protocol (see below)."
 msgstr ""
 
@@ -38866,8 +38927,8 @@ msgid ""
 "There are two broad cases, ordinary functions that don't have any C<FileIn> "
 "and C<FileOut> parameters, which are handled with very simple request/reply "
 "messages.  Then there are functions that have any C<FileIn> or C<FileOut> "
-"parameters, which use the same request and reply messages, but they may also "
-"be followed by files sent using a chunked encoding."
+"parameters, which use the same request and reply messages, but they may also"
+" be followed by files sent using a chunked encoding."
 msgstr ""
 
 #. type: =head3
@@ -38895,9 +38956,9 @@ msgstr ""
 #: ../src/guestfs.pod:2483
 msgid ""
 "The total length field allows the daemon to allocate a fixed size buffer "
-"into which it slurps the rest of the message.  As a result, the total length "
-"is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the "
-"effective size of any request is limited to somewhere under this size."
+"into which it slurps the rest of the message.  As a result, the total length"
+" is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the"
+" effective size of any request is limited to somewhere under this size."
 msgstr ""
 
 #. type: textblock
@@ -38989,8 +39050,8 @@ msgstr ""
 #: ../src/guestfs.pod:2530
 msgid ""
 "A C<FileIn> parameter indicates that we transfer a file I<into> the guest.  "
-"The normal request message is sent (see above).  However this is followed by "
-"a sequence of file chunks."
+"The normal request message is sent (see above).  However this is followed by"
+" a sequence of file chunks."
 msgstr ""
 
 #. type: verbatim
@@ -39039,8 +39100,8 @@ msgstr ""
 msgid ""
 "At time of writing there are no functions that have more than one FileIn "
 "parameter.  However this is (theoretically) supported, by sending the "
-"sequence of chunks for each FileIn parameter one after another (from left to "
-"right)."
+"sequence of chunks for each FileIn parameter one after another (from left to"
+" right)."
 msgstr ""
 
 #. type: textblock
@@ -39070,8 +39131,8 @@ msgid ""
 "This protocol allows the transfer of arbitrary sized files (no 32 bit "
 "limit), and also files where the size is not known in advance (eg. from "
 "pipes or sockets).  However the chunks are rather small "
-"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need "
-"to keep much in memory."
+"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need"
+" to keep much in memory."
 msgstr ""
 
 #. type: =head3
@@ -39109,8 +39170,8 @@ msgstr ""
 #: ../src/guestfs.pod:2597
 msgid ""
 "When the daemon launches it sends an initial word (C<GUESTFS_LAUNCH_FLAG>) "
-"which indicates that the guest and daemon is alive.  This is what L</"
-"guestfs_launch> waits for."
+"which indicates that the guest and daemon is alive.  This is what "
+"L</guestfs_launch> waits for."
 msgstr ""
 
 #. type: =head3
@@ -39129,9 +39190,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2607
 msgid ""
-"The library turns them into progress callbacks (see L</"
-"GUESTFS_EVENT_PROGRESS>) if there is a callback registered, or discards them "
-"if not."
+"The library turns them into progress callbacks (see "
+"L</GUESTFS_EVENT_PROGRESS>) if there is a callback registered, or discards "
+"them if not."
 msgstr ""
 
 #. type: textblock
@@ -39180,11 +39241,11 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2635
 msgid ""
-"As time passes we cherry pick fixes from the development branch and backport "
-"those into the stable branch, the effect being that the stable branch should "
-"get more stable and less buggy over time.  So the stable releases are ideal "
-"for people who don't need new features but would just like the software to "
-"work."
+"As time passes we cherry pick fixes from the development branch and backport"
+" those into the stable branch, the effect being that the stable branch "
+"should get more stable and less buggy over time.  So the stable releases are"
+" ideal for people who don't need new features but would just like the "
+"software to work."
 msgstr ""
 
 #. type: textblock
@@ -39225,12 +39286,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2670
 msgid ""
-"A new stable branch starts when we think the new features in development are "
-"substantial and compelling enough over the current stable branch to warrant "
-"it.  When that happens we create new stable and development versions 1.N.0 "
+"A new stable branch starts when we think the new features in development are"
+" substantial and compelling enough over the current stable branch to warrant"
+" it.  When that happens we create new stable and development versions 1.N.0 "
 "and 1.(N+1).0 [N is even].  The new dot-oh release won't necessarily be so "
-"stable at this point, but by backporting fixes from development, that branch "
-"will stabilize over time."
+"stable at this point, but by backporting fixes from development, that branch"
+" will stabilize over time."
 msgstr ""
 
 #. type: =head1
@@ -39268,10 +39329,10 @@ msgstr ""
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
-"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the "
-"former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
-"an example of the latter, since a trace flag is maintained in the handle and "
-"all tracing is done on the library side."
+"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the"
+" former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
+"an example of the latter, since a trace flag is maintained in the handle and"
+" all tracing is done on the library side."
 msgstr ""
 
 #. type: textblock
@@ -39290,8 +39351,8 @@ msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
 "library and do not travel over the RPC mechanism to the daemon, these "
-"functions do not need a procedure number, and so the procedure number is set "
-"to C<-1>."
+"functions do not need a procedure number, and so the procedure number is set"
+" to C<-1>."
 msgstr ""
 
 #. type: textblock
@@ -39340,10 +39401,10 @@ msgstr ""
 #: ../src/guestfs.pod:2737
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
-"can either be added as part of the API description (C<generator/"
-"generator_actions.ml>), or in some rarer cases you may want to drop a script "
-"into C<regressions/>.  Note that adding a script to C<regressions/> is "
-"slower, so if possible use the first method."
+"can either be added as part of the API description "
+"(C<generator/generator_actions.ml>), or in some rarer cases you may want to "
+"drop a script into C<regressions/>.  Note that adding a script to "
+"C<regressions/> is slower, so if possible use the first method."
 msgstr ""
 
 #. type: textblock
@@ -39482,8 +39543,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2802
 msgid ""
-"See C<capitests/tests.c> for more details of how these environment variables "
-"work."
+"See C<capitests/tests.c> for more details of how these environment variables"
+" work."
 msgstr ""
 
 #. type: =head2
@@ -39527,8 +39588,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2823
 msgid ""
-"If you use Emacs, add the following to one of one of your start-up files (e."
-"g., ~/.emacs), to help ensure that you get indentation right:"
+"If you use Emacs, add the following to one of one of your start-up files "
+"(e.g., ~/.emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
@@ -39600,8 +39661,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2860
 msgid ""
-"In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
-"which are used to do shell quoting."
+"In the daemon code we have created custom printf formatters C<%Q> and C<%R>,"
+" which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
@@ -39644,10 +39705,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2883
 msgid ""
-"I<Note:> Do I<not> use these when you are passing parameters to the C<command"
-"{,r,v,rv}()> functions.  These parameters do NOT need to be quoted because "
-"they are not passed via the shell (instead, straight to exec).  You probably "
-"want to use the C<sysroot_path()> function however."
+"I<Note:> Do I<not> use these when you are passing parameters to the "
+"C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
+"because they are not passed via the shell (instead, straight to exec).  You "
+"probably want to use the C<sysroot_path()> function however."
 msgstr ""
 
 #. type: =head2
@@ -39658,8 +39719,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2891
 msgid ""
-"Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
-"libguestfs> and CC to L<rjones@redhat.com>."
+"Submit patches to the mailing list: "
+"L<http://www.redhat.com/mailman/listinfo/libguestfs> and CC to "
+"L<rjones@redhat.com>."
 msgstr ""
 
 #. type: =head2
@@ -39676,9 +39738,9 @@ msgstr ""
 #: ../src/guestfs.pod:2899
 msgid ""
 "However many messages come from the daemon, and we don't translate those at "
-"the moment.  One reason is that the appliance generally has all locale files "
-"removed from it, because they take up a lot of space.  So we'd have to readd "
-"some of those, as well as copying our PO files into the appliance."
+"the moment.  One reason is that the appliance generally has all locale files"
+" removed from it, because they take up a lot of space.  So we'd have to "
+"readd some of those, as well as copying our PO files into the appliance."
 msgstr ""
 
 #. type: textblock
@@ -39738,8 +39800,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2931
 msgid ""
-"Safety and liveness tests of components that libguestfs depends upon (not of "
-"libguestfs itself).  Mainly this is for qemu and the kernel."
+"Safety and liveness tests of components that libguestfs depends upon (not of"
+" libguestfs itself).  Mainly this is for qemu and the kernel."
 msgstr ""
 
 #. type: =item
@@ -39772,7 +39834,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2945
 msgid ""
-"The daemon that runs inside the libguestfs appliance and carries out actions."
+"The daemon that runs inside the libguestfs appliance and carries out "
+"actions."
 msgstr ""
 
 #. type: =item
@@ -39814,8 +39877,8 @@ msgstr ""
 #: ../src/guestfs.pod:2962
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
-"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
-"L<virt-tar-out(1)>."
+"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L"
+"<virt-tar-out(1)>."
 msgstr ""
 
 #. type: =item
@@ -40040,8 +40103,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3056
 msgid ""
-"When we make a stable release, there are several steps documented here.  See "
-"L</LIBGUESTFS VERSION NUMBERS> for general information about the stable "
+"When we make a stable release, there are several steps documented here.  See"
+" L</LIBGUESTFS VERSION NUMBERS> for general information about the stable "
 "branch policy."
 msgstr ""
 
@@ -40105,8 +40168,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3095
 msgid ""
-"Create new stable and development directories under L<http://libguestfs.org/"
-"download>."
+"Create new stable and development directories under "
+"L<http://libguestfs.org/download>."
 msgstr ""
 
 #. type: textblock
@@ -40150,8 +40213,8 @@ msgstr ""
 #: ../src/guestfs.pod:3121
 msgid ""
 "A simple call such as L</guestfs_cat> returns its result (the file data) in "
-"a simple string.  Because this string is at some point internally encoded as "
-"a message, the maximum size that it can return is slightly under 4 MB.  If "
+"a simple string.  Because this string is at some point internally encoded as"
+" a message, the maximum size that it can return is slightly under 4 MB.  If "
 "the requested file is larger than this then you will get an error."
 msgstr ""
 
@@ -40177,14 +40240,15 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3136
-msgid "When using virtio disks (the default) the current limit is B<25> disks."
+msgid ""
+"When using virtio disks (the default) the current limit is B<25> disks."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3139
 msgid ""
-"Virtio itself consumes 1 virtual PCI slot per disk, and PCI is limited to 31 "
-"slots.  However febootstrap only understands disks with names C</dev/vda> "
+"Virtio itself consumes 1 virtual PCI slot per disk, and PCI is limited to 31"
+" slots.  However febootstrap only understands disks with names C</dev/vda> "
 "through C</dev/vdz> (26 letters) and it reserves one disk for its own "
 "purposes."
 msgstr ""
@@ -40217,8 +40281,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3155
 msgid ""
-"This is because it reserves 4 bits for the minor device number (thus C</dev/"
-"vda>, and C</dev/vda1> through C</dev/vda15>)."
+"This is because it reserves 4 bits for the minor device number (thus "
+"C</dev/vda>, and C</dev/vda1> through C</dev/vda15>)."
 msgstr ""
 
 #. type: textblock
@@ -40271,16 +40335,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3180
 msgid ""
-"The MBR (ie. classic MS-DOS) partitioning scheme uses 32 bit sector "
-"numbers.  Assuming a 512 byte sector size, this means that MBR cannot "
-"address a partition located beyond 2 TB on the disk."
+"The MBR (ie. classic MS-DOS) partitioning scheme uses 32 bit sector numbers."
+"  Assuming a 512 byte sector size, this means that MBR cannot address a "
+"partition located beyond 2 TB on the disk."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3184
 msgid ""
-"It is recommended that you use GPT partitions on disks which are larger than "
-"this size.  GPT uses 64 bit sector numbers and so can address partitions "
+"It is recommended that you use GPT partitions on disks which are larger than"
+" this size.  GPT uses 64 bit sector numbers and so can address partitions "
 "which are theoretically larger than the largest disk we could support."
 msgstr ""
 
@@ -40305,8 +40369,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3197
 msgid ""
-"The API functions L</guestfs_upload>, L</guestfs_download>, L</"
-"guestfs_tar_in>, L</guestfs_tar_out> and the like allow unlimited sized "
+"The API functions L</guestfs_upload>, L</guestfs_download>, "
+"L</guestfs_tar_in>, L</guestfs_tar_out> and the like allow unlimited sized "
 "uploads and downloads."
 msgstr ""
 
@@ -40356,21 +40420,21 @@ msgstr ""
 msgid ""
 "L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-"
 "ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-ruby(3)>, "
-"L<guestfish(1)>, L<guestmount(1)>, L<virt-alignment-scan(1)>, L<virt-cat(1)"
-">, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)>, "
-"L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-filesystems(1)>, "
-"L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-rescue"
-"(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<virt-tar"
-"(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, L<qemu(1)>, "
-"L<febootstrap(1)>, L<febootstrap-supermin-helper(8)>, L<hivex(3)>, L<stap(1)"
-">, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<guestmount(1)>, L<virt-alignment-scan(1)>, L<virt-"
+"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-"
+"edit(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-"
+"filesystems(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-"
+"fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-"
+"sysprep(1)>, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-"
+"win-reg(1)>, L<qemu(1)>, L<febootstrap(1)>, L<febootstrap-supermin-"
+"helper(8)>, L<hivex(3)>, L<stap(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3308
 msgid ""
-"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, L<lvm"
-"(8)>, L<disktype(1)>."
+"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, "
+"L<lvm(8)>, L<disktype(1)>."
 msgstr ""
 
 #. type: =head1
@@ -40387,8 +40451,7 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3319
 msgid ""
-"L<https://bugzilla.redhat.com/buglist.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/buglist.cgi?component=libguestfs&product=Virtualization+Tools>"
 msgstr ""
 
 #. type: textblock
@@ -40399,8 +40462,7 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3323
 msgid ""
-"L<https://bugzilla.redhat.com/enter_bug.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools>"
 msgstr ""
 
 #. type: textblock
@@ -40426,8 +40488,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3343
 msgid ""
-"Run libguestfs-test-tool and paste the B<complete, unedited> output into the "
-"bug report."
+"Run libguestfs-test-tool and paste the B<complete, unedited> output into the"
+" bug report."
 msgstr ""
 
 #. type: textblock
@@ -40494,8 +40556,8 @@ msgstr ""
 msgid ""
 "If it fails (and/or exits with non-zero error code), please paste the "
 "I<complete, unedited> output of the test tool into a bug report.  More "
-"information about reporting bugs can be found on the L<http://libguestfs.org/"
-"> website."
+"information about reporting bugs can be found on the "
+"L<http://libguestfs.org/> website."
 msgstr ""
 
 #. type: textblock
@@ -40588,8 +40650,8 @@ msgstr ""
 #. type: textblock
 #: ../test-tool/libguestfs-test-tool.pod:82
 msgid ""
-"Refer to L<febootstrap-supermin-helper(8)/ENVIRONMENT VARIABLES> for further "
-"information."
+"Refer to L<febootstrap-supermin-helper(8)/ENVIRONMENT VARIABLES> for further"
+" information."
 msgstr ""
 
 #. type: =head1
@@ -40655,16 +40717,16 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-list-filesystems.pl:45
 msgid ""
-"C<virt-list-filesystems> is a command line tool to list the filesystems that "
-"are contained in a virtual machine or disk image."
+"C<virt-list-filesystems> is a command line tool to list the filesystems that"
+" are contained in a virtual machine or disk image."
 msgstr ""
 
 #. type: textblock
 #: ../tools/virt-list-filesystems.pl:49
 msgid ""
 "C<virt-list-filesystems> is just a simple wrapper around L<libguestfs(3)> "
-"functionality.  For more complex cases you should look at the L<guestfish(1)"
-"> tool."
+"functionality.  For more complex cases you should look at the "
+"L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -40690,8 +40752,8 @@ msgstr ""
 #: ../tools/virt-list-filesystems.pl:197
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-tar(1)>, L<virt-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, L<Sys::"
-"Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -40733,8 +40795,8 @@ msgstr ""
 #: ../tools/virt-list-partitions.pl:50
 msgid ""
 "C<virt-list-partitions> is just a simple wrapper around L<libguestfs(3)> "
-"functionality.  For more complex cases you should look at the L<guestfish(1)"
-"> tool."
+"functionality.  For more complex cases you should look at the "
+"L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -40745,8 +40807,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-list-partitions.pl:123
 msgid ""
-"With this option, C<virt-list-partitions> displays the type and size of each "
-"partition too (where \"type\" means C<ext3>, C<pv> etc.)"
+"With this option, C<virt-list-partitions> displays the type and size of each"
+" partition too (where \"type\" means C<ext3>, C<pv> etc.)"
 msgstr ""
 
 #. type: =item
@@ -40769,8 +40831,8 @@ msgstr ""
 #: ../tools/virt-list-partitions.pl:267
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib"
-"(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -40811,11 +40873,11 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:49
 msgid ""
 "Virt-make-fs is a command line tool for creating a filesystem from a tar "
-"archive or some files in a directory.  It is similar to tools like L<mkisofs"
-"(1)>, L<genisoimage(1)> and L<mksquashfs(1)>.  Unlike those tools, it can "
-"create common filesystem types like ext2/3 or NTFS, which can be useful if "
-"you want to attach these filesystems to existing virtual machines (eg. to "
-"import large amounts of read-only data to a VM)."
+"archive or some files in a directory.  It is similar to tools like "
+"L<mkisofs(1)>, L<genisoimage(1)> and L<mksquashfs(1)>.  Unlike those tools, "
+"it can create common filesystem types like ext2/3 or NTFS, which can be "
+"useful if you want to attach these filesystems to existing virtual machines "
+"(eg. to import large amounts of read-only data to a VM)."
 msgstr ""
 
 #. type: textblock
@@ -40837,8 +40899,8 @@ msgid ""
 "where C<input> is either a directory containing files that you want to add, "
 "or a tar archive (either uncompressed tar or gzip-compressed tar); and "
 "C<output.img> is a disk image.  The input type is detected automatically.  "
-"The output disk image defaults to a raw ext2 sparse image unless you specify "
-"extra flags (see L</OPTIONS> below)."
+"The output disk image defaults to a raw ext2 sparse image unless you specify"
+" extra flags (see L</OPTIONS> below)."
 msgstr ""
 
 #. type: =head2
@@ -40849,8 +40911,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:69
 msgid ""
-"The default filesystem type is C<ext2>.  Just about any filesystem type that "
-"libguestfs supports can be used (but I<not> read-only formats like "
+"The default filesystem type is C<ext2>.  Just about any filesystem type that"
+" libguestfs supports can be used (but I<not> read-only formats like "
 "ISO9660).  Here are some of the more common choices:"
 msgstr ""
 
@@ -40862,9 +40924,9 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:77
 msgid ""
-"Note that ext3 filesystems contain a journal, typically 1-32 MB in size.  If "
-"you are not going to use the filesystem in a way that requires the journal, "
-"then this is just wasted overhead."
+"Note that ext3 filesystems contain a journal, typically 1-32 MB in size.  If"
+" you are not going to use the filesystem in a way that requires the journal,"
+" then this is just wasted overhead."
 msgstr ""
 
 #. type: =item
@@ -40880,8 +40942,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:85
 msgid ""
-"I<Note for vfat>: The tar archive or local directory must only contain files "
-"which are owned by root (ie. UID:GID = 0:0).  The reason is that the tar "
+"I<Note for vfat>: The tar archive or local directory must only contain files"
+" which are owned by root (ie. UID:GID = 0:0).  The reason is that the tar "
 "program running within libguestfs is unable to change the ownership of non-"
 "root files, since vfat itself does not support this."
 msgstr ""
@@ -40934,8 +40996,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:110
 msgid ""
-"On the other hand, if you have a partition table then the output image is no "
-"longer a straight filesystem.  For example you cannot run L<fsck(8)> "
+"On the other hand, if you have a partition table then the output image is no"
+" longer a straight filesystem.  For example you cannot run L<fsck(8)> "
 "directly on a partitioned disk image.  (However libguestfs tools such as "
 "L<guestfish(1)> and L<virt-resize(1)> can still be used)."
 msgstr ""
@@ -40979,8 +41041,8 @@ msgid ""
 "Unlike formats such as tar and squashfs, a filesystem does not \"just fit\" "
 "the files that it contains, but might have extra space.  Depending on how "
 "you are going to use the output, you might think this extra space is wasted "
-"and want to minimize it, or you might want to leave space so that more files "
-"can be added later.  Virt-make-fs defaults to minimizing the extra space, "
+"and want to minimize it, or you might want to leave space so that more files"
+" can be added later.  Virt-make-fs defaults to minimizing the extra space, "
 "but you can use the I<--size> flag to leave space in the filesystem if you "
 "want it."
 msgstr ""
@@ -40990,10 +41052,10 @@ msgstr ""
 msgid ""
 "An alternative way to leave extra space but not make the output image any "
 "bigger is to use an alternative disk image format (instead of the default "
-"\"raw\" format).  Using I<--format=qcow2> will use the native QEmu/KVM qcow2 "
-"image format (check your hypervisor supports this before using it).  This "
-"allows you to choose a large I<--size> but the extra space won't actually be "
-"allocated in the image until you try to store something in it."
+"\"raw\" format).  Using I<--format=qcow2> will use the native QEmu/KVM qcow2"
+" image format (check your hypervisor supports this before using it).  This "
+"allows you to choose a large I<--size> but the extra space won't actually be"
+" allocated in the image until you try to store something in it."
 msgstr ""
 
 #. type: textblock
@@ -41053,8 +41115,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:199
 msgid ""
-"To choose a fixed size output disk, specify an absolute number followed by b/"
-"K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
+"To choose a fixed size output disk, specify an absolute number followed by "
+"b/K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
 "Petabytes or Exabytes.  This must be large enough to contain all the input "
 "files, else you will get an error."
 msgstr ""
@@ -41062,8 +41124,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:204
 msgid ""
-"To leave extra space, specify C<+> (plus sign) and a number followed by b/K/"
-"M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
+"To leave extra space, specify C<+> (plus sign) and a number followed by "
+"b/K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
 "Petabytes or Exabytes.  For example: I<--size=+200M> means enough space for "
 "the input files, and (approximately) an extra 200 MB free space."
 msgstr ""
@@ -41072,9 +41134,9 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:210
 msgid ""
 "Note that virt-make-fs estimates free space, and therefore will not produce "
-"filesystems containing precisely the free space requested.  (It is much more "
-"expensive and time-consuming to produce a filesystem which has precisely the "
-"desired free space)."
+"filesystems containing precisely the free space requested.  (It is much more"
+" expensive and time-consuming to produce a filesystem which has precisely "
+"the desired free space)."
 msgstr ""
 
 #. type: =item
@@ -41143,7 +41205,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:253
 msgid ""
-"If specified, this flag adds an MBR partition table to the output disk image."
+"If specified, this flag adds an MBR partition table to the output disk "
+"image."
 msgstr ""
 
 #. type: textblock
@@ -41193,8 +41256,8 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:559
 msgid ""
 "L<guestfish(1)>, L<virt-resize(1)>, L<virt-tar-in(1)>, L<mkisofs(1)>, "
-"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, L<guestfs"
-"(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
+"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, "
+"L<guestfs(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -41216,8 +41279,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:579
 msgid ""
-"Attach /tmp/virt-make-fs.log to a new bug report at L<https://bugzilla."
-"redhat.com/>"
+"Attach /tmp/virt-make-fs.log to a new bug report at "
+"L<https://bugzilla.redhat.com/>"
 msgstr ""
 
 #. type: textblock
@@ -41315,8 +41378,8 @@ msgstr ""
 #: ../tools/virt-tar.pl:66
 msgid ""
 "You must I<not> use C<virt-tar> with the I<-u> option (upload) on live "
-"virtual machines.  If you do this, you risk disk corruption in the VM.  "
-"C<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
+"virtual machines.  If you do this, you risk disk corruption in the VM.  C"
+"<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
 msgstr ""
 
 #. type: textblock
@@ -41342,8 +41405,8 @@ msgstr ""
 #: ../tools/virt-tar.pl:84
 msgid ""
 "If you want to just view a single file, use L<virt-cat(1)>.  If you just "
-"want to edit a single file, use L<virt-edit(1)>.  For more complex cases you "
-"should look at the L<guestfish(1)> tool."
+"want to edit a single file, use L<virt-edit(1)>.  For more complex cases you"
+" should look at the L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -41351,8 +41414,8 @@ msgstr ""
 msgid ""
 "There are two modes of operation: I<-x> (eXtract) downloads a directory and "
 "its contents (recursively) from the virtual machine into a local tarball.  "
-"I<-u> uploads from a local tarball, unpacking it into a directory inside the "
-"virtual machine.  You cannot use these two options together."
+"I<-u> uploads from a local tarball, unpacking it into a directory inside the"
+" virtual machine.  You cannot use these two options together."
 msgstr ""
 
 #. type: textblock
@@ -41368,8 +41431,8 @@ msgstr ""
 msgid ""
 "C<virt-tar> can only handle tar (optionally gzipped) format tarballs.  For "
 "example it cannot do PKZip files or bzip2 compression.  If you want that "
-"then you'll have to rebuild the tarballs yourself.  (This is a limitation of "
-"the L<libguestfs(3)> API)."
+"then you'll have to rebuild the tarballs yourself.  (This is a limitation of"
+" the L<libguestfs(3)> API)."
 msgstr ""
 
 #. type: =item
@@ -41402,8 +41465,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-tar.pl:171
 msgid ""
-"Use I<-u> to upload and unpack from a local tarball into a virtual machine.  "
-"Please read the L</WARNING> section above before using this option."
+"Use I<-u> to upload and unpack from a local tarball into a virtual machine."
+"  Please read the L</WARNING> section above before using this option."
 msgstr ""
 
 #. type: textblock
@@ -41429,16 +41492,17 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-tar.pl:298
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-copy-"
-"in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<Sys::"
-"Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs."
-"org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-"
+"copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, "
+"L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
 #: ../tools/virt-win-reg.pl:37
 msgid ""
-"virt-win-reg - Export and merge Windows Registry entries from a Windows guest"
+"virt-win-reg - Export and merge Windows Registry entries from a Windows "
+"guest"
 msgstr ""
 
 #. type: verbatim
@@ -41493,10 +41557,10 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:58
 msgid ""
-"Modifying the Windows Registry is an inherently risky operation.  The format "
-"is deliberately obscure and undocumented, and Registry changes can leave the "
-"system unbootable.  Therefore when using the I<--merge> option, make sure "
-"you have a reliable backup first."
+"Modifying the Windows Registry is an inherently risky operation.  The format"
+" is deliberately obscure and undocumented, and Registry changes can leave "
+"the system unbootable.  Therefore when using the I<--merge> option, make "
+"sure you have a reliable backup first."
 msgstr ""
 
 #. type: textblock
@@ -41516,8 +41580,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:71
 msgid ""
-"If I<--merge> is I<not> specified, then the chosen registry key is displayed/"
-"exported (recursively).  For example:"
+"If I<--merge> is I<not> specified, then the chosen registry key is "
+"displayed/exported (recursively).  For example:"
 msgstr ""
 
 #. type: verbatim
@@ -41564,8 +41628,8 @@ msgstr ""
 msgid ""
 "This program is only meant for simple access to the registry.  If you want "
 "to do complicated things with the registry, we suggest you download the "
-"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)> "
-"and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
+"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)>"
+" and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
 "L<hivexregedit(1)>."
 msgstr ""
 
@@ -41586,8 +41650,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:165
 msgid ""
 "Note that I<--merge> is I<unsafe> to use on live virtual machines, and will "
-"result in disk corruption.  However exporting (without this flag)  is always "
-"safe."
+"result in disk corruption.  However exporting (without this flag)  is always"
+" safe."
 msgstr ""
 
 #. type: =item
@@ -41599,8 +41663,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:175
 msgid ""
 "When merging (only), you may need to specify the encoding for strings to be "
-"used in the hive file.  This is explained in detail in L<Win::Hivex::Regedit"
-"(3)/ENCODING STRINGS>."
+"used in the hive file.  This is explained in detail in "
+"L<Win::Hivex::Regedit(3)/ENCODING STRINGS>."
 msgstr ""
 
 #. type: textblock
@@ -41618,16 +41682,16 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:188
 msgid ""
-"When exporting (only), assume strings are UTF-16LE and print them as strings "
-"instead of hex sequences.  Remove the final zero codepoint from strings if "
+"When exporting (only), assume strings are UTF-16LE and print them as strings"
+" instead of hex sequences.  Remove the final zero codepoint from strings if "
 "present."
 msgstr ""
 
 #. type: textblock
 #: ../tools/virt-win-reg.pl:192
 msgid ""
-"This is unsafe and does not preserve the fidelity of strings in the original "
-"Registry for various reasons:"
+"This is unsafe and does not preserve the fidelity of strings in the original"
+" Registry for various reasons:"
 msgstr ""
 
 #. type: textblock
@@ -41733,8 +41797,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:585
 msgid ""
-"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for "
-"C<HKEY_USERS>."
+"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for"
+" C<HKEY_USERS>."
 msgstr ""
 
 #. type: textblock
@@ -41777,8 +41841,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:604
 msgid ""
-"To go in the opposite direction, after exporting and before sending the file "
-"to a Windows user, do something like this:"
+"To go in the opposite direction, after exporting and before sending the file"
+" to a Windows user, do something like this:"
 msgstr ""
 
 #. type: verbatim
@@ -41834,8 +41898,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:627
 msgid ""
 "C<CurrentControlSet> is usually an alias for C<ControlSet001>.  In some "
-"circumstances it might refer to another control set.  The way to find out is "
-"to look at the C<HKLM\\SYSTEM\\Select> key:"
+"circumstances it might refer to another control set.  The way to find out is"
+" to look at the C<HKLM\\SYSTEM\\Select> key:"
 msgstr ""
 
 #. type: verbatim
@@ -41902,8 +41966,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:656
 msgid ""
-"Note that some of these tips modify the guest disk image.  The guest I<must> "
-"be shut off, else you will get disk corruption."
+"Note that some of these tips modify the guest disk image.  The guest I<must>"
+" be shut off, else you will get disk corruption."
 msgstr ""
 
 #. type: =head2
@@ -41947,8 +42011,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:674
 msgid ""
 "In this example we use the key C<RunOnce> which means that the script will "
-"run precisely once when the first user logs in.  If you want it to run every "
-"time a user logs in, replace C<RunOnce> with C<Run>."
+"run precisely once when the first user logs in.  If you want it to run every"
+" time a user logs in, replace C<RunOnce> with C<Run>."
 msgstr ""
 
 #. type: textblock
@@ -41982,7 +42046,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:689
 msgid ""
 "First upload the program and optionally the service wrapper.  In this case "
-"the test program is called C<test.exe> and we are using the RHSrvAny wrapper:"
+"the test program is called C<test.exe> and we are using the RHSrvAny "
+"wrapper:"
 msgstr ""
 
 #. type: verbatim
@@ -42083,9 +42148,10 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:759
 msgid ""
-"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, L<guestfish(1)"
-">, L<virt-cat(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Win::Hivex"
-"(3)>, L<Win::Hivex::Regedit(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, "
+"L<guestfish(1)>, L<virt-cat(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Win::Hivex(3)>, L<Win::Hivex::Regedit(3)>, "
+"L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: verbatim
@@ -42100,6 +42166,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:780
 msgid ""
-"Attach /tmp/virt-win-reg.log to a new bug report at L<https://bugzilla."
-"redhat.com/>"
+"Attach /tmp/virt-win-reg.log to a new bug report at "
+"L<https://bugzilla.redhat.com/>"
 msgstr ""
+
+
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 7a9fd754..ccce7a02 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Red Hat Inc.
 # This file is distributed under the same license as the libguestfs package.
-#
+# 
 # Translators:
 # Yuri Chornoivan <yurchor@ukr.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
-"Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
+"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/\n"
 "POT-Creation-Date: 2011-10-26 21:10+0200\n"
-"PO-Revision-Date: 2011-10-19 15:46+0000\n"
+"PO-Revision-Date: 2011-10-27 09:15+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:3 ../cat/virt-cat.pod:3
@@ -107,8 +106,8 @@ msgid ""
 "When older operating systems install themselves, the partitioning tools "
 "place partitions at a sector misaligned with the underlying storage "
 "(commonly the first partition starts on sector C<63>).  Misaligned "
-"partitions can result in an operating system issuing more I/O than should be "
-"necessary."
+"partitions can result in an operating system issuing more I/O than should be"
+" necessary."
 msgstr ""
 
 #. type: textblock
@@ -121,10 +120,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:25
 msgid ""
-"Currently there is no virt tool for fixing alignment problems.  You can only "
-"reinstall the guest operating system.  The following NetApp document "
-"summarises the problem and possible solutions: L<http://media.netapp.com/"
-"documents/tr-3747.pdf>"
+"Currently there is no virt tool for fixing alignment problems.  You can only"
+" reinstall the guest operating system.  The following NetApp document "
+"summarises the problem and possible solutions: "
+"L<http://media.netapp.com/documents/tr-3747.pdf>"
 msgstr ""
 
 #. type: =head1
@@ -328,8 +327,8 @@ msgstr ""
 #: ../fish/guestfish.pod:174 ../fuse/guestmount.pod:102
 #: ../inspector/virt-inspector.pod:71 ../rescue/virt-rescue.pod:100
 msgid ""
-"The format of the disk image is auto-detected.  To override this and force a "
-"particular format use the I<--format=..> option."
+"The format of the disk image is auto-detected.  To override this and force a"
+" particular format use the I<--format=..> option."
 msgstr ""
 
 #. type: =item
@@ -597,10 +596,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:174
 msgid ""
-"Operating systems older than Windows 2008 and Linux before ca.2010 place the "
-"first sector of the first partition at sector 63, with a 512 byte sector "
-"size.  This happens because of a historical accident.  Drives have to report "
-"a cylinder / head / sector (CHS) geometry to the BIOS.  The geometry is "
+"Operating systems older than Windows 2008 and Linux before ca.2010 place the"
+" first sector of the first partition at sector 63, with a 512 byte sector "
+"size.  This happens because of a historical accident.  Drives have to report"
+" a cylinder / head / sector (CHS) geometry to the BIOS.  The geometry is "
 "completely meaningless on modern drives, but it happens that the geometry "
 "reported always has 63 sectors per track.  The operating system therefore "
 "places the first partition at the start of the second \"track\", at sector "
@@ -622,8 +621,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:190
 msgid ""
-"if the host OS uses local storage directly on hard drive partitions, and the "
-"hard drive has 512 byte physical sectors."
+"if the host OS uses local storage directly on hard drive partitions, and the"
+" hard drive has 512 byte physical sectors."
 msgstr ""
 
 #. type: =item
@@ -700,8 +699,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:229
 msgid ""
-"New versions of the Linux kernel expose the physical and logical block size, "
-"and minimum and recommended I/O size."
+"New versions of the Linux kernel expose the physical and logical block size,"
+" and minimum and recommended I/O size."
 msgstr ""
 
 #. type: textblock
@@ -754,9 +753,10 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:258
 msgid ""
-"For detailed information about what these numbers mean, see L<http://docs."
-"redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/"
-"Storage_Administration_Guide/newstorage-iolimits.html>"
+"For detailed information about what these numbers mean, see "
+"L<http://docs.redhat.com/docs/en-"
+"US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/newstorage-"
+"iolimits.html>"
 msgstr ""
 
 #. type: textblock
@@ -781,9 +781,9 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:269
 msgid ""
-"Assuming 512 byte sectors in the guest, you will now see the first partition "
-"starting at sector 2048, and subsequent partitions (if any)  will start at a "
-"multiple of 2048 sectors."
+"Assuming 512 byte sectors in the guest, you will now see the first partition"
+" starting at sector 2048, and subsequent partitions (if any)  will start at "
+"a multiple of 2048 sectors."
 msgstr ""
 
 #. type: textblock
@@ -801,11 +801,11 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:278
 msgid ""
-"L<virt-resize(1)> can change the alignment of the partitions of some "
-"guests.  Currently it can fully align all the partitions of all Windows "
-"guests, and it will fix the bootloader where necessary.  For Linux guests, "
-"it can align the second and subsequent partitions, so the majority of OS "
-"accesses except at boot will be aligned."
+"L<virt-resize(1)> can change the alignment of the partitions of some guests."
+"  Currently it can fully align all the partitions of all Windows guests, and"
+" it will fix the bootloader where necessary.  For Linux guests, it can align"
+" the second and subsequent partitions, so the majority of OS accesses except"
+" at boot will be aligned."
 msgstr ""
 
 #. type: textblock
@@ -819,17 +819,17 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:288
 msgid ""
-"For older versions of Windows, the following NetApp document contains useful "
-"information: L<http://media.netapp.com/documents/tr-3747.pdf>"
+"For older versions of Windows, the following NetApp document contains useful"
+" information: L<http://media.netapp.com/documents/tr-3747.pdf>"
 msgstr ""
 
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:291
 msgid ""
 "For Red Hat Enterprise Linux E<le> 5, use a Kickstart script that contains "
-"an explicit C<%pre> section that creates aligned partitions using L<parted(8)"
-">.  Do not use the Kickstart C<part> command.  The NetApp document above "
-"contains an example."
+"an explicit C<%pre> section that creates aligned partitions using "
+"L<parted(8)>.  Do not use the Kickstart C<part> command.  The NetApp "
+"document above contains an example."
 msgstr ""
 
 #. type: =head1
@@ -856,8 +856,8 @@ msgstr ""
 msgid ""
 "Libvirt guest names can contain arbitrary characters, some of which have "
 "meaning to the shell such as C<#> and space.  You may need to quote or "
-"escape these characters on the command line.  See the shell manual page L<sh"
-"(1)> for details."
+"escape these characters on the command line.  See the shell manual page "
+"L<sh(1)> for details."
 msgstr ""
 
 #. type: =head1
@@ -998,8 +998,8 @@ msgstr ""
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:332
 msgid ""
-"successful exit, some partitions have alignment E<lt> 4K which can result in "
-"poor performance on most hypervisors"
+"successful exit, some partitions have alignment E<lt> 4K which can result in"
+" poor performance on most hypervisors"
 msgstr ""
 
 #. type: =head1
@@ -1026,8 +1026,8 @@ msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
 #. type: textblock
 #: ../align/virt-alignment-scan.pod:339
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-rescue(1)>, "
-"L<virt-resize(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-rescue(1)>, L"
+"<virt-resize(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: =head1
@@ -1139,9 +1139,9 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:600 ../tools/virt-tar.pl:329
 #: ../tools/virt-win-reg.pl:801
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"You should have received a copy of the GNU General Public License along with"
+" this program; if not, write to the Free Software Foundation, Inc., 675 Mass"
+" Ave, Cambridge, MA 02139, USA."
 msgstr ""
 "Ви маєте отримати копію GNU General Public License разом з цією програмою; "
 "якщо це не так, повідомте про факт за адресою Free Software Foundation, "
@@ -1211,8 +1211,8 @@ msgstr ""
 #: ../cat/virt-cat.pod:24
 msgid ""
 "Multiple filenames can be given, in which case they are concatenated "
-"together.  Each filename must be a full path, starting at the root directory "
-"(starting with '/')."
+"together.  Each filename must be a full path, starting at the root directory"
+" (starting with '/')."
 msgstr ""
 "Ви можете вказати декілька назв файлів. Вміст таких файлів буде об’єднано. "
 "Назви файлів слід вказувати повністю (разом зі шляхом), починаючи з "
@@ -1346,8 +1346,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:67 ../rescue/virt-rescue.pod:96
 msgid ""
 "Add I<file> which should be a disk image from a virtual machine.  If the "
-"virtual machine has multiple block devices, you must supply all of them with "
-"separate I<-a> options."
+"virtual machine has multiple block devices, you must supply all of them with"
+" separate I<-a> options."
 msgstr ""
 
 #. type: =item
@@ -1360,10 +1360,10 @@ msgstr "B<--echo-keys>"
 #. type: textblock
 #: ../cat/virt-cat.pod:100
 msgid ""
-"When prompting for keys and passphrases, virt-cat normally turns echoing off "
-"so you cannot see what you are typing.  If you are not worried about Tempest "
-"attacks and there is no one else in the room you can specify this flag to "
-"see what you are typing."
+"When prompting for keys and passphrases, virt-cat normally turns echoing off"
+" so you cannot see what you are typing.  If you are not worried about "
+"Tempest attacks and there is no one else in the room you can specify this "
+"flag to see what you are typing."
 msgstr ""
 
 #. type: verbatim
@@ -1398,8 +1398,8 @@ msgstr "B<--keys-from-stdin>"
 #: ../cat/virt-ls.pod:363 ../edit/virt-edit.pod:158 ../fish/guestfish.pod:291
 #: ../fuse/guestmount.pod:174 ../inspector/virt-inspector.pod:116
 msgid ""
-"Read key or passphrase parameters from stdin.  The default is to try to read "
-"passphrases from the user by opening C</dev/tty>."
+"Read key or passphrase parameters from stdin.  The default is to try to read"
+" passphrases from the user by opening C</dev/tty>."
 msgstr ""
 
 #. type: =head1
@@ -1537,8 +1537,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-cat.pod:221
 msgid ""
-"The command above uses libguestfs's guest inspection feature and so does not "
-"work on guests that libguestfs cannot inspect, or on things like arbitrary "
+"The command above uses libguestfs's guest inspection feature and so does not"
+" work on guests that libguestfs cannot inspect, or on things like arbitrary "
 "disk images that don't contain guests.  To display a file from a disk image "
 "directly, use:"
 msgstr ""
@@ -1570,11 +1570,11 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-cat.pod:245
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L<virt-"
-"tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L"
+"<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L<virt-"
-"tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L"
+"<virt-tar-out(1)>, L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../cat/virt-cat.pod:258 ../inspector/virt-inspector.pod:405
@@ -1611,8 +1611,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:15
 msgid ""
 "This tool allows you to discover filesystems, partitions, logical volumes, "
-"and their sizes in a disk image or virtual machine.  It is a replacement for "
-"L<virt-list-filesystems(1)> and L<virt-list-partitions(1)>."
+"and their sizes in a disk image or virtual machine.  It is a replacement for"
+" L<virt-list-filesystems(1)> and L<virt-list-partitions(1)>."
 msgstr ""
 
 #. type: textblock
@@ -1732,8 +1732,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:64
 msgid ""
-"Similarly you can use I<--logical-volumes>, I<--volume-groups>, I<--physical-"
-"volumes>, I<--block-devices> to list those items."
+"Similarly you can use I<--logical-volumes>, I<--volume-groups>, I"
+"<--physical-volumes>, I<--block-devices> to list those items."
 msgstr ""
 
 #. type: textblock
@@ -1750,8 +1750,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-filesystems.pod:74
 msgid ""
-"UUIDs (because they are quite long) are not shown by default.  Add the I<--"
-"uuid> option to display device and filesystem UUIDs in the long output."
+"UUIDs (because they are quite long) are not shown by default.  Add the "
+"I<--uuid> option to display device and filesystem UUIDs in the long output."
 msgstr ""
 
 #. type: textblock
@@ -1789,10 +1789,10 @@ msgstr "B<--all>"
 #. type: textblock
 #: ../cat/virt-filesystems.pod:112
 msgid ""
-"Display everything.  This is currently the same as specifying these options: "
-"I<--filesystems>, I<--extra>, I<--partitions>, I<--block-devices>, I<--"
-"logical-volumes>, I<--volume-groups>, I<--physical-volumes>.  (More may be "
-"added to this list in future)."
+"Display everything.  This is currently the same as specifying these options:"
+" I<--filesystems>, I<--extra>, I<--partitions>, I<--block-devices>, I"
+"<--logical-volumes>, I<--volume-groups>, I<--physical-volumes>.  (More may "
+"be added to this list in future)."
 msgstr ""
 
 #. type: textblock
@@ -1846,8 +1846,8 @@ msgstr "B<--extra>"
 #: ../cat/virt-filesystems.pod:157
 msgid ""
 "This causes filesystems that are not ordinary, mountable filesystems to be "
-"displayed.  This category includes swapspace, and filesystems that are empty "
-"or contain unknown data."
+"displayed.  This category includes swapspace, and filesystems that are empty"
+" or contain unknown data."
 msgstr ""
 
 #. type: textblock
@@ -1934,8 +1934,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:213
 msgid ""
 "The extra columns displayed depend on what output you select, and the "
-"ordering of columns may change in future versions.  Use the title row, I<--"
-"csv> output and/or L<csvtool(1)> to match columns to data in external "
+"ordering of columns may change in future versions.  Use the title row, "
+"I<--csv> output and/or L<csvtool(1)> to match columns to data in external "
 "programs."
 msgstr ""
 
@@ -1969,8 +1969,8 @@ msgstr "B<--logical-volumes>"
 #. type: textblock
 #: ../cat/virt-filesystems.pod:229
 msgid ""
-"Display LVM logical volumes.  In this mode, these are displayed irrespective "
-"of whether the LVs contain filesystems."
+"Display LVM logical volumes.  In this mode, these are displayed irrespective"
+" of whether the LVs contain filesystems."
 msgstr ""
 
 #. type: =item
@@ -2089,8 +2089,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:298
 msgid ""
 "For device and partition names these are displayed as canonical libguestfs "
-"names, so that for example C</dev/sda2> is the second partition on the first "
-"device."
+"names, so that for example C</dev/sda2> is the second partition on the first"
+" device."
 msgstr ""
 
 #. type: textblock
@@ -2136,17 +2136,15 @@ msgstr ""
 
 #. type: =item
 #: ../cat/virt-filesystems.pod:319
-#, fuzzy
-#| msgid "B<MB>"
 msgid "B<MBR>"
-msgstr "B<MB>"
+msgstr ""
 
 #. type: textblock
 #: ../cat/virt-filesystems.pod:321
 msgid ""
 "The partition type byte, displayed as a two digit hexadecimal number.  A "
-"comprehensive list of partition types can be found here: L<http://www.win."
-"tue.nl/~aeb/partitions/partition_types-1.html>"
+"comprehensive list of partition types can be found here: "
+"L<http://www.win.tue.nl/~aeb/partitions/partition_types-1.html>"
 msgstr ""
 
 #. type: textblock
@@ -2175,9 +2173,9 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:334
 msgid ""
 "The parent column records the parent relationship between objects.  For "
-"example, if the object is a partition, then this column contains the name of "
-"the containing device.  If the object is a logical volume, then this column "
-"is the name of the volume group."
+"example, if the object is a partition, then this column contains the name of"
+" the containing device.  If the object is a logical volume, then this column"
+" is the name of the volume group."
 msgstr ""
 
 #. type: =item
@@ -2215,8 +2213,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:354 ../cat/virt-ls.pod:464
 #: ../df/virt-df.pod:196
 msgid ""
-"Myth: Just split fields at commas.  Reality: This does I<not> work "
-"reliably.  This example has two columns:"
+"Myth: Just split fields at commas.  Reality: This does I<not> work reliably."
+"  This example has two columns:"
 msgstr ""
 
 #. type: verbatim
@@ -2258,8 +2256,8 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:368 ../cat/virt-ls.pod:478
 #: ../df/virt-df.pod:210
 msgid ""
-"For other languages, use a CSV processing library (eg. C<Text::CSV> for Perl "
-"or Python's built-in csv library)."
+"For other languages, use a CSV processing library (eg. C<Text::CSV> for Perl"
+" or Python's built-in csv library)."
 msgstr ""
 
 #. type: textblock
@@ -2272,12 +2270,12 @@ msgstr ""
 #: ../cat/virt-filesystems.pod:387
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
-"libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-df(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, L<http://"
-"libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<csvtool(1)>, "
+"L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../cat/virt-filesystems.pod:402 ../tools/virt-win-reg.pl:789
@@ -2336,23 +2334,23 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:24
 msgid ""
-"Multiple directory names can be given, in which case the output from each is "
-"concatenated."
+"Multiple directory names can be given, in which case the output from each is"
+" concatenated."
 msgstr ""
 
 #. type: textblock
 #: ../cat/virt-ls.pod:27
 msgid ""
-"To list directories from a libvirt guest use the I<-d> option to specify the "
-"name of the guest.  For a disk image, use the I<-a> option."
+"To list directories from a libvirt guest use the I<-d> option to specify the"
+" name of the guest.  For a disk image, use the I<-a> option."
 msgstr ""
 
 #. type: textblock
 #: ../cat/virt-ls.pod:31
 msgid ""
-"C<virt-ls> can do many simple file listings.  For more complicated cases you "
-"may need to use L<guestfish(1)>, or write a program directly to the L<guestfs"
-"(3)> API."
+"C<virt-ls> can do many simple file listings.  For more complicated cases you"
+" may need to use L<guestfish(1)>, or write a program directly to the "
+"L<guestfs(3)> API."
 msgstr ""
 
 #. type: textblock
@@ -2467,8 +2465,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:71
 msgid ""
-"Find the differences between files in a guest and an earlier snapshot of the "
-"same guest."
+"Find the differences between files in a guest and an earlier snapshot of the"
+" same guest."
 msgstr ""
 
 #. type: verbatim
@@ -2485,10 +2483,10 @@ msgstr ""
 #: ../cat/virt-ls.pod:78
 msgid ""
 "The commands above won't find files where the content has changed but the "
-"metadata (eg. file size and modification date) is the same.  To do that, you "
-"need to add the I<--checksum> parameter to both C<virt-ls> commands.  I<--"
-"checksum> can be quite slow since it has to read and compute a checksum of "
-"every regular file in the virtual machine."
+"metadata (eg. file size and modification date) is the same.  To do that, you"
+" need to add the I<--checksum> parameter to both C<virt-ls> commands.  "
+"I<--checksum> can be quite slow since it has to read and compute a checksum "
+"of every regular file in the virtual machine."
 msgstr ""
 
 #. type: =head1
@@ -2618,8 +2616,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:132
 msgid ""
-"Most of the interesting features of C<virt-ls> are only available when using "
-"I<-lR> mode."
+"Most of the interesting features of C<virt-ls> are only available when using"
+" I<-lR> mode."
 msgstr ""
 
 #. type: textblock
@@ -2627,11 +2625,11 @@ msgstr ""
 msgid ""
 "The fields are normally space-separated.  Filenames are B<not> quoted, so "
 "you cannot use the output in another program (because filenames can contain "
-"spaces and other unsafe characters).  If the guest was untrusted and someone "
-"knew you were using C<virt-ls> to analyze the guest, they could play tricks "
-"on you by creating filenames with embedded newline characters.  To B<safely> "
-"parse the output in another program, use the I<--csv> (Comma-Separated "
-"Values) option."
+"spaces and other unsafe characters).  If the guest was untrusted and someone"
+" knew you were using C<virt-ls> to analyze the guest, they could play tricks"
+" on you by creating filenames with embedded newline characters.  To "
+"B<safely> parse the output in another program, use the I<--csv> (Comma-"
+"Separated Values) option."
 msgstr ""
 
 #. type: textblock
@@ -2896,8 +2894,8 @@ msgstr ""
 #: ../cat/virt-ls.pod:316
 msgid ""
 "When prompting for keys and passphrases, virt-ls normally turns echoing off "
-"so you cannot see what you are typing.  If you are not worried about Tempest "
-"attacks and there is no one else in the room you can specify this flag to "
+"so you cannot see what you are typing.  If you are not worried about Tempest"
+" attacks and there is no one else in the room you can specify this flag to "
 "see what you are typing."
 msgstr ""
 
@@ -2953,8 +2951,8 @@ msgstr ""
 #. type: textblock
 #: ../cat/virt-ls.pod:378
 msgid ""
-"C<virt-ls -l> produces a \"long listing\", which shows more detail.  See L</"
-"LONG LISTING>."
+"C<virt-ls -l> produces a \"long listing\", which shows more detail.  See "
+"L</LONG LISTING>."
 msgstr ""
 
 #. type: textblock
@@ -3091,10 +3089,10 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:15
 msgid ""
-"Virt-sysprep \"resets\" or \"unconfigures\" a virtual machine so that clones "
-"can be made from it.  Steps in this process include removing SSH host keys, "
-"removing persistent network MAC configuration, and removing user accounts.  "
-"Each step can be enabled or disabled as required."
+"Virt-sysprep \"resets\" or \"unconfigures\" a virtual machine so that clones"
+" can be made from it.  Steps in this process include removing SSH host keys,"
+" removing persistent network MAC configuration, and removing user accounts."
+"  Each step can be enabled or disabled as required."
 msgstr ""
 
 #. type: textblock
@@ -3109,15 +3107,16 @@ msgstr ""
 msgid ""
 "Virt-sysprep modifies the guest or disk image I<in place>.  The guest must "
 "be shut down.  If you want to preserve the existing contents of the guest, "
-"you I<must copy or clone the disk first>.  See L</COPYING AND CLONING> below."
+"you I<must copy or clone the disk first>.  See L</COPYING AND CLONING> "
+"below."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:29
 msgid ""
 "You do I<not> need to run virt-sysprep as root.  In fact we'd generally "
-"recommend that you don't.  The time you might want to run it as root is when "
-"you need root in order to access the disk image, but even in this case it "
+"recommend that you don't.  The time you might want to run it as root is when"
+" you need root in order to access the disk image, but even in this case it "
 "would be better to change the permissions on the disk image to be writable "
 "as the non-root user running virt-sysprep."
 msgstr ""
@@ -3125,8 +3124,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:35
 msgid ""
-"\"Sysprep\" stands for \"system preparation\" tool.  The name comes from the "
-"Microsoft program C<sysprep.exe> which is used to unconfigure Windows "
+"\"Sysprep\" stands for \"system preparation\" tool.  The name comes from the"
+" Microsoft program C<sysprep.exe> which is used to unconfigure Windows "
 "machines in preparation for cloning them.  Having said that, virt-sysprep "
 "does I<not> currently work on Microsoft Windows guests.  We plan to support "
 "Windows sysprepping in a future version, and we already have code to do it."
@@ -3237,8 +3236,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:135
 msgid ""
-"The default is to try to detect if SELinux relabelling is required.  See L</"
-"SELINUX RELABELLING> below for more details."
+"The default is to try to detect if SELinux relabelling is required.  See "
+"L</SELINUX RELABELLING> below for more details."
 msgstr ""
 
 #. type: =head1
@@ -3249,8 +3248,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:158
 msgid ""
-"If the I<--enable> option is I<not> given, then I<all sysprep operations are "
-"enabled>, although some are skipped depending on the type of guest."
+"If the I<--enable> option is I<not> given, then I<all sysprep operations are"
+" enabled>, although some are skipped depending on the type of guest."
 msgstr ""
 
 #. type: textblock
@@ -3271,8 +3270,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:167
 msgid ""
-"To list the operations supported by the current version of virt-sysprep, use "
-"I<--list-operations>."
+"To list the operations supported by the current version of virt-sysprep, use"
+" I<--list-operations>."
 msgstr ""
 
 #. type: textblock
@@ -3328,8 +3327,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:191
 msgid ""
-"If the I<--hostname> parameter is not given, then the hostname is changed to "
-"C<localhost.localdomain>."
+"If the I<--hostname> parameter is not given, then the hostname is changed to"
+" C<localhost.localdomain>."
 msgstr ""
 
 #. type: =head2
@@ -3372,7 +3371,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:209
 msgid ""
-"Write some random bytes from the host into the random seed file of the guest."
+"Write some random bytes from the host into the random seed file of the "
+"guest."
 msgstr ""
 
 #. type: textblock
@@ -3450,8 +3450,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:242
 msgid ""
-"After a guest is cloned, the MAC address usually changes.  Since the old MAC "
-"address occupies the old name (eg. eth0), this means the fresh MAC address "
+"After a guest is cloned, the MAC address usually changes.  Since the old MAC"
+" address occupies the old name (eg. eth0), this means the fresh MAC address "
 "is assigned to a new name (eg. eth1) and this is usually undesirable.  "
 "Erasing the udev persistent net rules avoids this."
 msgstr ""
@@ -3615,8 +3615,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:349
 msgid ""
-"You can, of course, just copy the block device on the host using L<cp(1)> or "
-"L<dd(1)>."
+"You can, of course, just copy the block device on the host using L<cp(1)> or"
+" L<dd(1)>."
 msgstr ""
 
 #. type: verbatim
@@ -3651,23 +3651,23 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:370
 msgid ""
-"Use the block device as a backing file and create a snapshot on top for each "
-"guest.  The advantage is that you don't need to copy the block device (very "
-"fast) and only changes are stored (less storage required)."
+"Use the block device as a backing file and create a snapshot on top for each"
+" guest.  The advantage is that you don't need to copy the block device (very"
+" fast) and only changes are stored (less storage required)."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:375
 msgid ""
-"Note that writing to the backing file once you have created guests on top of "
-"it is not possible: you will corrupt the guests."
+"Note that writing to the backing file once you have created guests on top of"
+" it is not possible: you will corrupt the guests."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:378
 msgid ""
-"Tools that can do this include: L<qemu-img(1)> (with the I<create -f qcow2 -"
-"o backing_file> option), L<lvcreate(8)> (I<--snapshot> option).  Some "
+"Tools that can do this include: L<qemu-img(1)> (with the I<create -f qcow2 "
+"-o backing_file> option), L<lvcreate(8)> (I<--snapshot> option).  Some "
 "filesystems (such as btrfs) and most Network Attached Storage devices can "
 "also create cheap snapshots from files or LUNs."
 msgstr ""
@@ -3690,9 +3690,9 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:396
 msgid ""
-"A separate tool, L<virt-clone(1)>, can be used to duplicate the block device "
-"and/or modify the external libvirt configuration of a guest.  It will reset "
-"the name, UUID and MAC address of the guest in the libvirt XML."
+"A separate tool, L<virt-clone(1)>, can be used to duplicate the block device"
+" and/or modify the external libvirt configuration of a guest.  It will reset"
+" the name, UUID and MAC address of the guest in the libvirt XML."
 msgstr ""
 
 #. type: textblock
@@ -3719,8 +3719,8 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:409
 msgid ""
-"L<virt-sparsify(1)> can be used to make the cloning template smaller, making "
-"it easier to compress and/or faster to copy."
+"L<virt-sparsify(1)> can be used to make the cloning template smaller, making"
+" it easier to compress and/or faster to copy."
 msgstr ""
 
 #. type: textblock
@@ -3752,9 +3752,9 @@ msgstr ""
 msgid ""
 "If you want to give people cloned guests, but let them pick the size of the "
 "guest themselves (eg. depending on how much they are prepared to pay for "
-"disk space), then instead of copying the template, you can run L<virt-resize"
-"(1)>.  Virt-resize performs a copy and resize, and thus is ideal for cloning "
-"guests from a template."
+"disk space), then instead of copying the template, you can run L<virt-"
+"resize(1)>.  Virt-resize performs a copy and resize, and thus is ideal for "
+"cloning guests from a template."
 msgstr ""
 
 #. type: =head1
@@ -3766,18 +3766,19 @@ msgstr "БЕЗПЕКА"
 #: ../clone/virt-sysprep.pod:431
 msgid ""
 "Although virt-sysprep removes some sensitive information from the guest, it "
-"does not pretend to remove all of it.  You should examine the L</OPERATIONS> "
-"above, and the implementation of the operations in the shell script.  You "
+"does not pretend to remove all of it.  You should examine the L</OPERATIONS>"
+" above, and the implementation of the operations in the shell script.  You "
 "should also examine the guest afterwards."
 msgstr ""
 
 #. type: textblock
 #: ../clone/virt-sysprep.pod:436
 msgid ""
-"Sensitive files are simply removed.  The data they contained may still exist "
-"on the disk, easily recovered with a hex editor or undelete tool.  Use "
-"L<virt-sparsify(1)> as one way to remove this content.  See also the L<scrub"
-"(1)> command to get rid of deleted content in directory entries and inodes."
+"Sensitive files are simply removed.  The data they contained may still exist"
+" on the disk, easily recovered with a hex editor or undelete tool.  Use L"
+"<virt-sparsify(1)> as one way to remove this content.  See also the "
+"L<scrub(1)> command to get rid of deleted content in directory entries and "
+"inodes."
 msgstr ""
 
 #. type: =head2
@@ -3835,10 +3836,10 @@ msgstr ""
 #. type: textblock
 #: ../clone/virt-sysprep.pod:464
 msgid ""
-"If any new files are created by virt-sysprep, then virt-sysprep touches C</."
-"autorelabel> so that these will be correctly labelled by SELinux the next "
-"time the guest is booted.  This process interrupts boot and can take some "
-"time."
+"If any new files are created by virt-sysprep, then virt-sysprep touches "
+"C</.autorelabel> so that these will be correctly labelled by SELinux the "
+"next time the guest is booted.  This process interrupts boot and can take "
+"some time."
 msgstr ""
 
 #. type: textblock
@@ -3864,8 +3865,8 @@ msgstr ""
 #: ../clone/virt-sysprep.pod:488
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, L<virt-"
-"resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-img(1)"
-">, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
+"resize(1)>, L<virt-sparsify(1)>, L<virsh(1)>, L<lvcreate(8)>, L<qemu-"
+"img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 msgstr ""
 
 #. type: textblock
@@ -3927,20 +3928,20 @@ msgstr ""
 #. type: textblock
 #: ../df/virt-df.pod:28
 msgid ""
-"If used without any I<-a> or I<-d> arguments, C<virt-df> checks with libvirt "
-"to get a list of all active and inactive guests, and performs a C<df>-type "
+"If used without any I<-a> or I<-d> arguments, C<virt-df> checks with libvirt"
+" to get a list of all active and inactive guests, and performs a C<df>-type "
 "operation on each one in turn, printing out the results."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:32
 msgid ""
-"If any I<-a> or I<-d> arguments are specified, C<virt-df> performs a C<df>-"
-"type operation on either the single named libvirt domain, or on the disk "
-"image(s) listed on the command line (which must all belong to a single VM).  "
-"In this mode (with arguments), C<virt-df> will I<only work for a single "
-"guest>.  If you want to run on multiple guests, then you have to invoke "
-"C<virt-df> multiple times."
+"If any I<-a> or I<-d> arguments are specified, C<virt-df> performs a "
+"C<df>-type operation on either the single named libvirt domain, or on the "
+"disk image(s) listed on the command line (which must all belong to a single "
+"VM).  In this mode (with arguments), C<virt-df> will I<only work for a "
+"single guest>.  If you want to run on multiple guests, then you have to "
+"invoke C<virt-df> multiple times."
 msgstr ""
 
 #. type: textblock
@@ -4044,8 +4045,8 @@ msgstr ""
 #. type: textblock
 #: ../df/virt-df.pod:150
 msgid ""
-"If you think an untrusted guest might actively try to exploit the libguestfs "
-"appliance kernel, then this prevents one guest from interfering with the "
+"If you think an untrusted guest might actively try to exploit the libguestfs"
+" appliance kernel, then this prevents one guest from interfering with the "
 "stats printed for another guest."
 msgstr ""
 
@@ -4061,23 +4062,23 @@ msgstr ""
 #: ../df/virt-df.pod:165
 msgid ""
 "Print UUIDs instead of names.  This is useful for following a guest even "
-"when the guest is migrated or renamed, or when two guests happen to have the "
-"same name."
+"when the guest is migrated or renamed, or when two guests happen to have the"
+" same name."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:169
 msgid ""
-"Note that only domains that we fetch from libvirt come with UUIDs.  For disk "
-"images, we still print the disk image name even when this option is "
+"Note that only domains that we fetch from libvirt come with UUIDs.  For disk"
+" images, we still print the disk image name even when this option is "
 "specified."
 msgstr ""
 
 #. type: textblock
 #: ../df/virt-df.pod:229
 msgid ""
-"L<df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<http://"
-"libguestfs.org/>."
+"L<df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -4151,8 +4152,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:32
 msgid ""
-"Multiple filenames can be given, in which case they are each edited in "
-"turn.  Each filename must be a full path, starting at the root directory "
+"Multiple filenames can be given, in which case they are each edited in turn."
+"  Each filename must be a full path, starting at the root directory "
 "(starting with '/')."
 msgstr ""
 
@@ -4164,8 +4165,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:38
 msgid ""
-"For more complex cases you should look at the L<guestfish(1)> tool (see L</"
-"USING GUESTFISH> below)."
+"For more complex cases you should look at the L<guestfish(1)> tool (see "
+"L</USING GUESTFISH> below)."
 msgstr ""
 
 #. type: textblock
@@ -4237,15 +4238,15 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:85
 msgid ""
-"Create a backup of the original file I<in the guest disk image>.  The backup "
-"has the original filename with C<extension> added."
+"Create a backup of the original file I<in the guest disk image>.  The backup"
+" has the original filename with C<extension> added."
 msgstr ""
 
 #. type: textblock
 #: ../edit/virt-edit.pod:88
 msgid ""
-"Usually the first character of C<extension> would be a dot C<.> so you would "
-"write:"
+"Usually the first character of C<extension> would be a dot C<.> so you would"
+" write:"
 msgstr ""
 
 #. type: verbatim
@@ -4282,7 +4283,8 @@ msgstr "B<--connect адреса>"
 #: ../tools/virt-list-partitions.pl:85 ../tools/virt-tar.pl:134
 #: ../tools/virt-win-reg.pl:135
 msgid ""
-"If you specify guest block devices directly, then libvirt is not used at all."
+"If you specify guest block devices directly, then libvirt is not used at "
+"all."
 msgstr ""
 
 #. type: textblock
@@ -4315,8 +4317,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:127
 msgid ""
-"Be careful to properly quote the expression to prevent it from being altered "
-"by the shell."
+"Be careful to properly quote the expression to prevent it from being altered"
+" by the shell."
 msgstr ""
 
 #. type: textblock
@@ -4431,8 +4433,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:226
 msgid ""
-"To delete a line, set C<$_> to the empty string.  For example, to delete the "
-"C<apache> user account from the password file you can do:"
+"To delete a line, set C<$_> to the empty string.  For example, to delete the"
+" C<apache> user account from the password file you can do:"
 msgstr ""
 
 #. type: verbatim
@@ -4448,8 +4450,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:231
 msgid ""
-"To insert a line, prepend or append it to C<$_>.  However appending lines to "
-"the end of the file is rather difficult this way since there is no concept "
+"To insert a line, prepend or append it to C<$_>.  However appending lines to"
+" the end of the file is rather difficult this way since there is no concept "
 "of \"last line of the file\" - your expression just doesn't get called "
 "again.  You might want to use the first method (setting C<$EDITOR>) if you "
 "want to do this."
@@ -4465,18 +4467,18 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:240
 msgid ""
-"The return value from the expression is ignored, but the expression may call "
-"C<die> in order to abort the whole program, leaving the original file "
+"The return value from the expression is ignored, but the expression may call"
+" C<die> in order to abort the whole program, leaving the original file "
 "untouched."
 msgstr ""
 
 #. type: textblock
 #: ../edit/virt-edit.pod:244
 msgid ""
-"Remember when matching the end of a line that C<$_> may contain the final C<"
-"\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
-"newline then neither of these.  Thus to match or substitute some text at the "
-"end of a line, use this regular expression:"
+"Remember when matching the end of a line that C<$_> may contain the final "
+"C<\\n>, or (for DOS files) C<\\r\\n>, or if the file does not end with a "
+"newline then neither of these.  Thus to match or substitute some text at the"
+" end of a line, use this regular expression:"
 msgstr ""
 
 #. type: verbatim
@@ -4492,8 +4494,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:251
 msgid ""
-"Alternately, use the perl C<chomp> function, being careful not to chomp C<"
-"$_> itself (since that would remove all newlines from the file):"
+"Alternately, use the perl C<chomp> function, being careful not to chomp "
+"C<$_> itself (since that would remove all newlines from the file):"
 msgstr ""
 
 #. type: verbatim
@@ -4550,8 +4552,8 @@ msgstr ""
 #. type: textblock
 #: ../edit/virt-edit.pod:309
 msgid ""
-"The command above uses libguestfs's guest inspection feature and so does not "
-"work on guests that libguestfs cannot inspect, or on things like arbitrary "
+"The command above uses libguestfs's guest inspection feature and so does not"
+" work on guests that libguestfs cannot inspect, or on things like arbitrary "
 "disk images that don't contain guests.  To edit a file on a disk image "
 "directly, use:"
 msgstr ""
@@ -4617,8 +4619,8 @@ msgstr "C<EDITOR>"
 #. type: textblock
 #: ../edit/virt-edit.pod:335
 msgid ""
-"If set, this string is used as the editor.  It may contain arguments, eg. C<"
-"\"emacs -nw\">"
+"If set, this string is used as the editor.  It may contain arguments, eg. "
+"C<\"emacs -nw\">"
 msgstr ""
 
 #. type: textblock
@@ -4660,8 +4662,8 @@ msgstr ""
 msgid ""
 "This manual page documents how to call libguestfs from the Erlang "
 "programming language.  This page just documents the differences from the C "
-"API and gives some examples.  If you are not familiar with using libguestfs, "
-"you also need to read L<guestfs(3)>."
+"API and gives some examples.  If you are not familiar with using libguestfs,"
+" you also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -4695,7 +4697,8 @@ msgstr ""
 
 #. type: textblock
 #: ../erlang/examples/guestfs-erlang.pod:33
-msgid "C<G> is the libguestfs handle which you should pass to other functions."
+msgid ""
+"C<G> is the libguestfs handle which you should pass to other functions."
 msgstr ""
 
 #. type: textblock
@@ -4860,8 +4863,8 @@ msgstr "@EXAMPLE2@"
 #. type: textblock
 #: ../erlang/examples/guestfs-erlang.pod:99
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)"
-">, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-java(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://www.erlang.org/>.  L<http://libguestfs.org/>."
 msgstr ""
 
@@ -4921,8 +4924,8 @@ msgstr ""
 #: ../ruby/examples/guestfs-ruby.pod:59 ../src/guestfs.pod:3357
 msgid ""
 "This library is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU Lesser General Public License as published by the "
-"Free Software Foundation; either version 2 of the License, or (at your "
+"under the terms of the GNU Lesser General Public License as published by the"
+" Free Software Foundation; either version 2 of the License, or (at your "
 "option) any later version."
 msgstr ""
 
@@ -4937,8 +4940,8 @@ msgstr ""
 msgid ""
 "This library is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License "
-"for more details."
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License"
+" for more details."
 msgstr ""
 
 #. type: textblock
@@ -5009,8 +5012,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-examples.pod:35
 msgid ""
-"L<guestfs(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)"
-">, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
@@ -5081,15 +5084,15 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:32
 msgid ""
 "The links below explain how to use L<guestfish(1)> to change the background "
-"image for a user of a Windows XP VM.  Unfortunately the technique appears to "
-"be substantially different for each version of Windows."
+"image for a user of a Windows XP VM.  Unfortunately the technique appears to"
+" be substantially different for each version of Windows."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:37
 msgid ""
-"https://lists.fedoraproject.org/pipermail/virt/2011-May/002655.html https://"
-"lists.fedoraproject.org/pipermail/virt/2011-May/002658.html"
+"https://lists.fedoraproject.org/pipermail/virt/2011-May/002655.html "
+"https://lists.fedoraproject.org/pipermail/virt/2011-May/002658.html"
 msgstr ""
 
 #. type: =head1
@@ -5134,15 +5137,15 @@ msgstr ""
 msgid ""
 "It is possible to do a \"sysprep\" using libguestfs alone, although not "
 "straightforward.  Currently there is code in the Aeolus Oz project which "
-"does this (using libguestfs).  As part of our review of the virt-clone tool, "
-"we may add sysprepping ability."
+"does this (using libguestfs).  As part of our review of the virt-clone tool,"
+" we may add sysprepping ability."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:60
 msgid ""
-"https://github.com/clalancette/oz https://www.redhat.com/archives/virt-tools-"
-"list/2011-May/msg00019.html"
+"https://github.com/clalancette/oz https://www.redhat.com/archives/virt-"
+"tools-list/2011-May/msg00019.html"
 msgstr ""
 
 #. type: =head1
@@ -5191,8 +5194,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:78
 msgid ""
-"https://rwmj.wordpress.com/2010/09/08/new-guestfish-n-options-in-1-5-9/"
-"#content"
+"https://rwmj.wordpress.com/2010/09/08/new-guestfish-n-options-"
+"in-1-5-9/#content"
 msgstr ""
 
 #. type: =head1
@@ -5356,8 +5359,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:153
 msgid ""
 "Although it sounds tempting, this is usually not a reliable way to get a "
-"backup from a running guest.  See the entry in the FAQ: http://libguestfs."
-"org/FAQ.html#backup"
+"backup from a running guest.  See the entry in the FAQ: "
+"http://libguestfs.org/FAQ.html#backup"
 msgstr ""
 
 #. type: =head1
@@ -5440,15 +5443,15 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:184
 msgid ""
-"https://rwmj.wordpress.com/2011/03/31/tip-code-for-getting-dhcp-address-from-"
-"a-virtual-machine-disk-image/#content"
+"https://rwmj.wordpress.com/2011/03/31/tip-code-for-getting-dhcp-address-"
+"from-a-virtual-machine-disk-image/#content"
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:186
 msgid ""
-"In the libguestfs source examples directory you will find the latest version "
-"of the C<virt-dhcp-address.c> program."
+"In the libguestfs source examples directory you will find the latest version"
+" of the C<virt-dhcp-address.c> program."
 msgstr ""
 
 #. type: =head1
@@ -5522,15 +5525,15 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:220
 msgid ""
-"https://rwmj.wordpress.com/2010/10/30/tip-use-augeas-to-get-the-default-boot-"
-"kernel-for-a-vm/#content"
+"https://rwmj.wordpress.com/2010/10/30/tip-use-augeas-to-get-the-default-"
+"boot-kernel-for-a-vm/#content"
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:222
 msgid ""
-"It uses Augeas, and the technique is generally applicable for many different "
-"tasks, such as:"
+"It uses Augeas, and the technique is generally applicable for many different"
+" tasks, such as:"
 msgstr ""
 
 #. type: textblock
@@ -5653,8 +5656,8 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:305
 msgid ""
 "If you want to run the script on disk images (instead of libvirt virtual "
-"machines), change C<-d \"$1\"> to C<-a \"$1\">.  See also L<virt-inspector(1)"
-">."
+"machines), change C<-d \"$1\"> to C<-a \"$1\">.  See also L<virt-"
+"inspector(1)>."
 msgstr ""
 
 #. type: =head1
@@ -5684,15 +5687,15 @@ msgstr ""
 #: ../examples/guestfs-recipes.pod:317
 msgid ""
 "The link below contains a script that can be used to list out the services "
-"from a Windows VM, and whether those services run at boot time or are loaded "
-"on demand."
+"from a Windows VM, and whether those services run at boot time or are loaded"
+" on demand."
 msgstr ""
 
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:321
 msgid ""
-"https://rwmj.wordpress.com/2010/12/10/tip-list-services-in-a-windows-guest/"
-"#content"
+"https://rwmj.wordpress.com/2010/12/10/tip-list-services-in-a-windows-"
+"guest/#content"
 msgstr ""
 
 #. type: =head1
@@ -5710,7 +5713,8 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:328
 msgid ""
-"https://rwmj.wordpress.com/2010/10/19/tip-making-a-disk-image-sparse/#content"
+"https://rwmj.wordpress.com/2010/10/19/tip-making-a-disk-image-"
+"sparse/#content"
 msgstr ""
 
 #. type: =head1
@@ -5850,9 +5854,9 @@ msgstr ""
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:386
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)"
-">, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-"
-"python(3)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<guestfs-examples(3)>, L<guestfs-"
+"erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L"
+"<guestfs-python(3)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -5896,16 +5900,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:22
 msgid ""
 "If you just want to add an ISO file (often you use this as an efficient way "
-"to transfer large files into the guest), then you should probably use L</add-"
-"drive-ro> instead."
+"to transfer large files into the guest), then you should probably use L"
+"</add-drive-ro> instead."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:214
 #: ../fish/guestfish-actions.pod:228
 msgid ""
-"I<This function is deprecated.> In new code, use the L</add_drive_opts> call "
-"instead."
+"I<This function is deprecated.> In new code, use the L</add_drive_opts> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -5954,9 +5958,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:41
 msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling L</add-drive-opts> on each one."
+"This function adds the disk(s) attached to the named libvirt domain C<dom>."
+"  It works by connecting to libvirt, requesting the domain and domain XML "
+"from libvirt, parsing it for disks, and calling L</add-drive-opts> on each "
+"one."
 msgstr ""
 
 #. type: textblock
@@ -5977,18 +5982,18 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:53 ../src/guestfs-actions.pod:72
 msgid ""
-"Disks must be accessible locally.  This often means that adding disks from a "
-"remote libvirt connection (see L<http://libvirt.org/remote.html>)  will fail "
-"unless those disks are accessible via the same device path locally too."
+"Disks must be accessible locally.  This often means that adding disks from a"
+" remote libvirt connection (see L<http://libvirt.org/remote.html>)  will "
+"fail unless those disks are accessible via the same device path locally too."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:58 ../src/guestfs-actions.pod:77
 msgid ""
-"The optional C<libvirturi> parameter sets the libvirt URI (see L<http://"
-"libvirt.org/uri.html>).  If this is not set then we connect to the default "
-"libvirt URI (or one set through an environment variable, see the libvirt "
-"documentation for full details)."
+"The optional C<libvirturi> parameter sets the libvirt URI (see "
+"L<http://libvirt.org/uri.html>).  If this is not set then we connect to the "
+"default libvirt URI (or one set through an environment variable, see the "
+"libvirt documentation for full details)."
 msgstr ""
 
 #. type: textblock
@@ -5997,8 +6002,8 @@ msgid ""
 "The optional C<live> flag controls whether this call will try to connect to "
 "a running virtual machine C<guestfsd> process if it sees a suitable "
 "E<lt>channelE<gt> element in the libvirt XML definition.  The default (if "
-"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING "
-"DAEMONS> for more information."
+"the flag is omitted) is never to try.  See L<guestfs(3)/ATTACHING TO RUNNING"
+" DAEMONS> for more information."
 msgstr ""
 
 #. type: textblock
@@ -6006,8 +6011,8 @@ msgstr ""
 msgid ""
 "If the C<allowuuid> flag is true (default is false) then a UUID I<may> be "
 "passed instead of the domain name.  The C<dom> string is treated as a UUID "
-"first and looked up, and if that lookup fails then we treat C<dom> as a name "
-"as usual."
+"first and looked up, and if that lookup fails then we treat C<dom> as a name"
+" as usual."
 msgstr ""
 
 #. type: textblock
@@ -6026,26 +6031,22 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:84 ../fish/guestfish-actions.pod:95
 #: ../fish/guestfish-actions.pod:106 ../src/guestfs-actions.pod:103
 #: ../src/guestfs-actions.pod:114 ../src/guestfs-actions.pod:125
-#, fuzzy
-#| msgid "C<readonly>"
 msgid "If C<readonly> is false:"
-msgstr "C<readonly>"
+msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:86 ../src/guestfs-actions.pod:105
 msgid ""
-"The whole call is aborted with an error if any disk with the E<lt>readonly/"
-"E<gt> flag is found."
+"The whole call is aborted with an error if any disk with the "
+"E<lt>readonly/E<gt> flag is found."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:89 ../fish/guestfish-actions.pod:100
 #: ../fish/guestfish-actions.pod:110 ../src/guestfs-actions.pod:108
 #: ../src/guestfs-actions.pod:119 ../src/guestfs-actions.pod:129
-#, fuzzy
-#| msgid "C<readonly>"
 msgid "If C<readonly> is true:"
-msgstr "C<readonly>"
+msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:91 ../fish/guestfish-actions.pod:102
@@ -6107,7 +6108,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3342 ../fish/guestfish-actions.pod:3505
 #: ../fish/guestfish-actions.pod:3640
 msgid ""
-"This command has one or more optional arguments.  See L</OPTIONAL ARGUMENTS>."
+"This command has one or more optional arguments.  See L</OPTIONAL "
+"ARGUMENTS>."
 msgstr ""
 
 #. type: =head2
@@ -6139,8 +6141,8 @@ msgid ""
 "Automatic detection of the format opens you up to a potential security hole "
 "when dealing with untrusted raw-format images.  See CVE-2010-3851 and "
 "RHBZ#642934.  Specifying the format closes this security hole.  Therefore "
-"you should think about replacing calls to this function with calls to L</add-"
-"drive-opts>, and specifying the format."
+"you should think about replacing calls to this function with calls to L"
+"</add-drive-opts>, and specifying the format."
 msgstr ""
 
 #. type: =head2
@@ -6173,9 +6175,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:153 ../src/guestfs-actions.pod:213
 msgid ""
 "You don't necessarily need to be root when using libguestfs.  However you "
-"obviously do need sufficient permissions to access the filename for whatever "
-"operations you want to perform (ie. read access if you just want to read the "
-"image or write access if you want to modify the image)."
+"obviously do need sufficient permissions to access the filename for whatever"
+" operations you want to perform (ie. read access if you just want to read "
+"the image or write access if you want to modify the image)."
 msgstr ""
 
 #. type: textblock
@@ -6210,9 +6212,9 @@ msgstr "C<format>"
 #. type: textblock
 #: ../fish/guestfish-actions.pod:173
 msgid ""
-"This forces the image format.  If you omit this (or use L</add-drive> or L</"
-"add-drive-ro>) then the format is automatically detected.  Possible formats "
-"include C<raw> and C<qcow2>."
+"This forces the image format.  If you omit this (or use L</add-drive> or L"
+"</add-drive-ro>) then the format is automatically detected.  Possible "
+"formats include C<raw> and C<qcow2>."
 msgstr ""
 
 #. type: textblock
@@ -6231,22 +6233,20 @@ msgstr "C<iface>"
 #. type: textblock
 #: ../fish/guestfish-actions.pod:184
 msgid ""
-"This rarely-used option lets you emulate the behaviour of the deprecated L</"
-"add-drive-with-if> call (q.v.)"
+"This rarely-used option lets you emulate the behaviour of the deprecated L"
+"</add-drive-with-if> call (q.v.)"
 msgstr ""
 
 #. type: =item
 #: ../fish/guestfish-actions.pod:187 ../src/guestfs-actions.pod:247
-#, fuzzy
-#| msgid "C<app_name>"
 msgid "C<name>"
-msgstr "C<app_name>"
+msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:189 ../src/guestfs-actions.pod:249
 msgid ""
-"The name the drive had in the original guest, e.g. /dev/sdb. This is used as "
-"a hint to the guest inspection process if it is available."
+"The name the drive had in the original guest, e.g. /dev/sdb. This is used as"
+" a hint to the guest inspection process if it is available."
 msgstr ""
 
 #. type: =head2
@@ -6351,8 +6351,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:246
 msgid ""
-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call L</aug-init> again before you can use any "
+"Close the current Augeas handle and free up any resources used by it.  After"
+" calling this, you have to call L</aug-init> again before you can use any "
 "other Augeas functions."
 msgstr ""
 
@@ -6511,9 +6511,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:317
 msgid ""
-"This option is only useful when debugging Augeas lenses.  Use of this option "
-"may require additional memory for the libguestfs appliance.  You may need to "
-"set the C<LIBGUESTFS_MEMSIZE> environment variable or call L</set-memsize>."
+"This option is only useful when debugging Augeas lenses.  Use of this option"
+" may require additional memory for the libguestfs appliance.  You may need "
+"to set the C<LIBGUESTFS_MEMSIZE> environment variable or call L</set-"
+"memsize>."
 msgstr ""
 
 #. type: =item
@@ -6572,8 +6573,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:344 ../src/guestfs-actions.pod:492
 msgid ""
-"Create a new sibling C<label> for C<path>, inserting it into the tree before "
-"or after C<path> (depending on the boolean flag C<before>)."
+"Create a new sibling C<label> for C<path>, inserting it into the tree before"
+" or after C<path> (depending on the boolean flag C<before>)."
 msgstr ""
 
 #. type: textblock
@@ -6773,9 +6774,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:424 ../src/guestfs-actions.pod:624
 msgid ""
-"The argument C<groups> is a list of group names, eg: C<[\"inotify\", \"augeas"
-"\"]> would check for the availability of the Linux inotify functions and "
-"Augeas (configuration file editing) functions."
+"The argument C<groups> is a list of group names, eg: C<[\"inotify\", "
+"\"augeas\"]> would check for the availability of the Linux inotify functions"
+" and Augeas (configuration file editing) functions."
 msgstr ""
 
 #. type: textblock
@@ -6786,8 +6787,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:431 ../src/guestfs-actions.pod:631
 msgid ""
-"It fails with an error if one or more of the requested groups is unavailable "
-"in the appliance."
+"It fails with an error if one or more of the requested groups is unavailable"
+" in the appliance."
 msgstr ""
 
 #. type: textblock
@@ -6856,8 +6857,8 @@ msgstr ""
 msgid ""
 "This command returns a list of all optional groups that this daemon knows "
 "about.  Note this returns both supported and unsupported groups.  To find "
-"out which ones the daemon can actually support you have to call L</"
-"available> on each member of the returned list."
+"out which ones the daemon can actually support you have to call "
+"L</available> on each member of the returned list."
 msgstr ""
 
 #. type: textblock
@@ -7034,8 +7035,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:545 ../src/guestfs-actions.pod:792
 msgid ""
-"This returns the size of sectors on a block device.  Usually 512, but can be "
-"larger for modern devices."
+"This returns the size of sectors on a block device.  Usually 512, but can be"
+" larger for modern devices."
 msgstr ""
 
 #. type: textblock
@@ -7067,8 +7068,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:560
 msgid ""
-"See also L</blockdev-getss> for the real sector size of the device, and L</"
-"blockdev-getsize64> for the more useful I<size in bytes>."
+"See also L</blockdev-getss> for the real sector size of the device, and L"
+"</blockdev-getsize64> for the more useful I<size in bytes>."
 msgstr ""
 
 #. type: =head2
@@ -7235,23 +7236,23 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:646 ../src/guestfs-actions.pod:964
 msgid ""
-"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-faq/"
-"#posixfilenames1>"
+"Bug or feature? You decide: L<http://www.tuxera.com/community/ntfs-3g-"
+"faq/#posixfilenames1>"
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:649 ../src/guestfs-actions.pod:967
 msgid ""
-"This function resolves the true case of each element in the path and returns "
-"the case-sensitive path."
+"This function resolves the true case of each element in the path and returns"
+" the case-sensitive path."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:652
 msgid ""
-"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return C<\"/"
-"WINDOWS/system32\"> (the exact return value would depend on details of how "
-"the directories were originally created under Windows)."
+"Thus L</case-sensitive-path> (\"/Windows/System32\")  might return "
+"C<\"/WINDOWS/system32\"> (the exact return value would depend on details of "
+"how the directories were originally created under Windows)."
 msgstr ""
 
 #. type: textblock
@@ -7290,8 +7291,8 @@ msgstr ""
 msgid ""
 "Note that this function cannot correctly handle binary files (specifically, "
 "files containing C<\\0> character which is treated as end of string).  For "
-"those you need to use the L</read-file> or L</download> functions which have "
-"a more complex interface."
+"those you need to use the L</read-file> or L</download> functions which have"
+" a more complex interface."
 msgstr ""
 
 #. type: textblock
@@ -7462,8 +7463,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:729
 msgid ""
 "This call computes the MD5, SHAx or CRC checksum of the contents of the "
-"device named C<device>.  For the types of checksums supported see the L</"
-"checksum> command."
+"device named C<device>.  For the types of checksums supported see the "
+"L</checksum> command."
 msgstr ""
 
 #. type: =head2
@@ -7482,16 +7483,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:737 ../src/guestfs-actions.pod:1087
 msgid ""
-"This command computes the checksums of all regular files in C<directory> and "
-"then emits a list of those checksums to the local output file C<sumsfile>."
+"This command computes the checksums of all regular files in C<directory> and"
+" then emits a list of those checksums to the local output file C<sumsfile>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:741 ../src/guestfs-actions.pod:1091
 msgid ""
 "This can be used for verifying the integrity of a virtual machine.  However "
-"to be properly secure you should pay attention to the output of the checksum "
-"command (it uses the ones from GNU coreutils).  In particular when the "
+"to be properly secure you should pay attention to the output of the checksum"
+" command (it uses the ones from GNU coreutils).  In particular when the "
 "filename is not printable, coreutils uses a special backslash syntax.  For "
 "more information, see the GNU coreutils info file."
 msgstr ""
@@ -7512,15 +7513,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:755 ../src/guestfs-actions.pod:1110
 msgid ""
-"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are "
-"supported."
+"Change the mode (permissions) of C<path> to C<mode>.  Only numeric modes are"
+" supported."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:758 ../src/guestfs-actions.pod:1113
 msgid ""
-"I<Note>: When using this command from guestfish, C<mode> by default would be "
-"decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
+"I<Note>: When using this command from guestfish, C<mode> by default would be"
+" decimal, unless you prefix it with C<0> to get octal, ie. use C<0700> not "
 "C<700>."
 msgstr ""
 
@@ -7587,8 +7588,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:783
 msgid ""
 "The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
+"is the name of the program to run.  Subsequent elements are parameters.  The"
+" list must be non-empty (ie. must contain a program name).  Note that the "
 "command runs directly, and is I<not> invoked via the shell (see L</sh>)."
 msgstr ""
 
@@ -7600,24 +7601,24 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:793 ../src/guestfs-actions.pod:1162
 msgid ""
-"If the command returns a non-zero exit status, then this function returns an "
-"error message.  The error message string is the content of I<stderr> from "
+"If the command returns a non-zero exit status, then this function returns an"
+" error message.  The error message string is the content of I<stderr> from "
 "the command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:797 ../src/guestfs-actions.pod:1166
 msgid ""
-"The C<$PATH> environment variable will contain at least C</usr/bin> and C</"
-"bin>.  If you require a program from another location, you should provide "
-"the full path in the first parameter."
+"The C<$PATH> environment variable will contain at least C</usr/bin> and "
+"C</bin>.  If you require a program from another location, you should provide"
+" the full path in the first parameter."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:802 ../src/guestfs-actions.pod:1171
 msgid ""
-"Shared libraries and data files required by the program must be available on "
-"filesystems which are mounted in the correct places.  It is the caller's "
+"Shared libraries and data files required by the program must be available on"
+" filesystems which are mounted in the correct places.  It is the caller's "
 "responsibility to ensure all filesystems that are needed are mounted at the "
 "right locations."
 msgstr ""
@@ -7669,8 +7670,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:830
 msgid ""
-"The C<ctype> and optional C<level> parameters have the same meaning as in L</"
-"compress-out>."
+"The C<ctype> and optional C<level> parameters have the same meaning as in L"
+"</compress-out>."
 msgstr ""
 
 #. type: =head2
@@ -7689,7 +7690,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:841 ../src/guestfs-actions.pod:1273
 msgid ""
-"This command compresses C<file> and writes it out to the local file C<zfile>."
+"This command compresses C<file> and writes it out to the local file "
+"C<zfile>."
 msgstr ""
 
 #. type: textblock
@@ -7705,8 +7707,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:850 ../src/guestfs-actions.pod:1282
 msgid ""
-"The optional C<level> parameter controls compression level.  The meaning and "
-"default for this parameter depends on the compression program being used."
+"The optional C<level> parameter controls compression level.  The meaning and"
+" default for this parameter depends on the compression program being used."
 msgstr ""
 
 #. type: =head2
@@ -7742,14 +7744,8 @@ msgstr ""
 
 #. type: =head2
 #: ../fish/guestfish-actions.pod:871
-#, fuzzy
-#| msgid ""
-#| " zero-device device\n"
-#| "\n"
 msgid "copy-device-to-device"
 msgstr ""
-" zero-device пристрій\n"
-"\n"
 
 #. type: verbatim
 #: ../fish/guestfish-actions.pod:873
@@ -7771,8 +7767,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:882 ../src/guestfs-actions.pod:1360
 msgid ""
 "Partial copies can be made since you can specify optionally the source "
-"offset, destination offset and size to copy.  These values are all specified "
-"in bytes.  If not given, the offsets both default to zero, and the size "
+"offset, destination offset and size to copy.  These values are all specified"
+" in bytes.  If not given, the offsets both default to zero, and the size "
 "defaults to copying as much as possible until we hit the end of the source."
 msgstr ""
 
@@ -7786,8 +7782,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:891 ../src/guestfs-actions.pod:1369
 msgid ""
-"If the destination is a file, it is created if required.  If the destination "
-"file is not large enough, it is extended."
+"If the destination is a file, it is created if required.  If the destination"
+" file is not large enough, it is extended."
 msgstr ""
 
 #. type: =head2
@@ -7811,10 +7807,8 @@ msgstr ""
 
 #. type: =head2
 #: ../fish/guestfish-actions.pod:905
-#, fuzzy
-#| msgid "pwrite-device"
 msgid "copy-file-to-device"
-msgstr "pwrite-device"
+msgstr ""
 
 #. type: verbatim
 #: ../fish/guestfish-actions.pod:907
@@ -7840,8 +7834,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:921
 msgid ""
-"This is B<not> the function you want for copying files.  This is for copying "
-"blocks within existing files.  See L</cp>, L</cp-a> and L</mv> for general "
+"This is B<not> the function you want for copying files.  This is for copying"
+" blocks within existing files.  See L</cp>, L</cp-a> and L</mv> for general "
 "file copying and moving functions."
 msgstr ""
 
@@ -7875,8 +7869,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:938 ../fish/guestfish-actions.pod:973
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"copy_device_to_device> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</copy_device_to_device> call instead."
 msgstr ""
 
 #. type: =head2
@@ -7915,8 +7909,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:956 ../src/guestfs-actions.pod:1612
 msgid ""
-"This copies a file or directory from C<src> to C<dest> recursively using the "
-"C<cp -a> command."
+"This copies a file or directory from C<src> to C<dest> recursively using the"
+" C<cp -a> command."
 msgstr ""
 
 #. type: =head2
@@ -7944,8 +7938,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:968
 msgid ""
 "If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see L</copy-device-to-device>)."
+"source file or device, otherwise the copy will fail.  This command cannot do"
+" partial copies (see L</copy-device-to-device>)."
 msgstr ""
 
 #. type: =head2
@@ -8023,8 +8017,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1009
 msgid ""
-"Another way to get the same information is to enable verbose messages with "
-"L</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
+"Another way to get the same information is to enable verbose messages with L"
+"</set-verbose> or by setting the environment variable C<LIBGUESTFS_DEBUG=1> "
 "before running the program."
 msgstr ""
 
@@ -8179,8 +8173,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1078 ../src/guestfs-actions.pod:1804
 msgid ""
 "This runs C<e2fsck -p -f device>, ie. runs the ext2/ext3 filesystem checker "
-"on C<device>, noninteractively (I<-p>), even if the filesystem appears to be "
-"clean (I<-f>)."
+"on C<device>, noninteractively (I<-p>), even if the filesystem appears to be"
+" clean (I<-f>)."
 msgstr ""
 
 #. type: textblock
@@ -8303,8 +8297,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1129 ../src/guestfs-actions.pod:1893
 msgid ""
-"This returns C<true> if and only if there is a file, directory (or anything) "
-"with the given C<path> name."
+"This returns C<true> if and only if there is a file, directory (or anything)"
+" with the given C<path> name."
 msgstr ""
 
 #. type: textblock
@@ -8467,9 +8461,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1207 ../src/guestfs-actions.pod:2009
 msgid ""
-"The output depends on the output of the underlying L<file(1)> command and it "
-"can change in future in ways beyond our control.  In other words, the output "
-"is not guaranteed by the ABI."
+"The output depends on the output of the underlying L<file(1)> command and it"
+" can change in future in ways beyond our control.  In other words, the "
+"output is not guaranteed by the ABI."
 msgstr ""
 
 #. type: textblock
@@ -8706,16 +8700,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1333 ../src/guestfs-actions.pod:2157
 msgid ""
 "This command creates a new file called C<path>.  The initial content of the "
-"file is C<len> octets of C<c>, where C<c> must be a number in the range C<"
-"[0..255]>."
+"file is C<len> octets of C<c>, where C<c> must be a number in the range "
+"C<[0..255]>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1337
 msgid ""
 "To fill a file with zero bytes (sparsely), it is much more efficient to use "
-"L</truncate-size>.  To create a file with a pattern of repeating bytes use "
-"L</fill-pattern>."
+"L</truncate-size>.  To create a file with a pattern of repeating bytes use L"
+"</fill-pattern>."
 msgstr ""
 
 #. type: =head2
@@ -8735,9 +8729,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1346
 msgid ""
 "This function is like L</fill> except that it creates a new file of length "
-"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern "
-"is truncated if necessary to ensure the length of the file is exactly C<len> "
-"bytes."
+"C<len> containing the repeating pattern of bytes in C<pattern>.  The pattern"
+" is truncated if necessary to ensure the length of the file is exactly "
+"C<len> bytes."
 msgstr ""
 
 #. type: =head2
@@ -8767,8 +8761,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1360 ../src/guestfs-actions.pod:2208
 msgid ""
-"This returns a list of strings I<without any prefix>.  Thus if the directory "
-"structure was:"
+"This returns a list of strings I<without any prefix>.  Thus if the directory"
+" structure was:"
 msgstr ""
 
 #. type: verbatim
@@ -8799,7 +8793,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1375 ../src/guestfs-actions.pod:2223
-msgid "If C<directory> is not a directory, then this command returns an error."
+msgid ""
+"If C<directory> is not a directory, then this command returns an error."
 msgstr ""
 
 #. type: textblock
@@ -8954,8 +8949,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1460 ../src/guestfs-actions.pod:2336
 msgid ""
-"A non-zero return code can mean \"success\", for example if errors have been "
-"corrected on the filesystem."
+"A non-zero return code can mean \"success\", for example if errors have been"
+" corrected on the filesystem."
 msgstr ""
 
 #. type: textblock
@@ -9137,8 +9132,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1534
 msgid ""
 "If L</set-memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default"
+" value for memsize."
 msgstr ""
 
 #. type: textblock
@@ -9403,8 +9398,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1623
 msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling L</umask>."
+"Return the current umask.  By default the umask is C<022> unless it has been"
+" set by calling L</umask>."
 msgstr ""
 
 #. type: =head2
@@ -9479,8 +9474,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1649 ../fish/guestfish-actions.pod:2715
 msgid ""
 "Normally it is better to get all extended attributes from a file in one go "
-"by calling L</getxattrs>.  However some Linux filesystem implementations are "
-"buggy and do not provide a way to list out attributes.  For these "
+"by calling L</getxattrs>.  However some Linux filesystem implementations are"
+" buggy and do not provide a way to list out attributes.  For these "
 "filesystems (notably ntfs-3g)  you have to know the names of the extended "
 "attributes you want in advance and call this function."
 msgstr ""
@@ -9489,8 +9484,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1656 ../fish/guestfish-actions.pod:2722
 #: ../src/guestfs-actions.pod:2648 ../src/guestfs-actions.pod:4143
 msgid ""
-"Extended attribute values are blobs of binary data.  If there is no extended "
-"attribute named C<name>, this returns an error."
+"Extended attribute values are blobs of binary data.  If there is no extended"
+" attribute named C<name>, this returns an error."
 msgstr ""
 
 #. type: textblock
@@ -9549,8 +9544,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1677 ../src/guestfs-actions.pod:2685
 msgid ""
-"This command searches for all the pathnames matching C<pattern> according to "
-"the wildcard expansion rules used by the shell."
+"This command searches for all the pathnames matching C<pattern> according to"
+" the wildcard expansion rules used by the shell."
 msgstr ""
 
 #. type: textblock
@@ -9562,8 +9557,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1684 ../src/guestfs-actions.pod:2692
 msgid ""
-"It is just a wrapper around the C L<glob(3)> function with flags C<GLOB_MARK|"
-"GLOB_BRACE>.  See that manual page for more details."
+"It is just a wrapper around the C L<glob(3)> function with flags "
+"C<GLOB_MARK|GLOB_BRACE>.  See that manual page for more details."
 msgstr ""
 
 #. type: =head2
@@ -9583,7 +9578,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1692 ../src/guestfs-actions.pod:2709
-msgid "This calls the external C<grep> program and returns the matching lines."
+msgid ""
+"This calls the external C<grep> program and returns the matching lines."
 msgstr ""
 
 #. type: =head2
@@ -9632,8 +9628,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1721 ../src/guestfs-actions.pod:2756
 msgid ""
-"There is currently no way in the API to install grub2, which is used by most "
-"modern Linux guests.  It is possible to run the grub2 command from the "
+"There is currently no way in the API to install grub2, which is used by most"
+" modern Linux guests.  It is possible to run the grub2 command from the "
 "guest, although see the caveats in L<guestfs(3)/RUNNING COMMANDS>."
 msgstr ""
 
@@ -9649,10 +9645,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1735 ../src/guestfs-actions.pod:2770
 msgid ""
 "If grub-install reports the error \"No suitable drive was found in the "
-"generated device map.\" it may be that you need to create a C</boot/grub/"
-"device.map> file first that contains the mapping between grub device names "
-"and Linux device names.  It is usually sufficient to create a file "
-"containing:"
+"generated device map.\" it may be that you need to create a "
+"C</boot/grub/device.map> file first that contains the mapping between grub "
+"device names and Linux device names.  It is usually sufficient to create a "
+"file containing:"
 msgstr ""
 
 #. type: verbatim
@@ -9686,7 +9682,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1752 ../src/guestfs-actions.pod:2793
 msgid ""
-"This command returns up to the first 10 lines of a file as a list of strings."
+"This command returns up to the first 10 lines of a file as a list of "
+"strings."
 msgstr ""
 
 #. type: =head2
@@ -9770,8 +9767,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1791 ../src/guestfs-actions.pod:2858
 msgid ""
-"For example, in guestfish you could use the following command to examine the "
-"boot script (usually called C</init>)  contained in a Linux initrd or "
+"For example, in guestfish you could use the following command to examine the"
+" boot script (usually called C</init>)  contained in a Linux initrd or "
 "initramfs image:"
 msgstr ""
 
@@ -9876,9 +9873,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1834 ../src/guestfs-actions.pod:2923
 msgid ""
-"This closes the inotify handle which was previously opened by inotify_init.  "
-"It removes all watches, throws away any pending events, and deallocates all "
-"resources."
+"This closes the inotify handle which was previously opened by inotify_init."
+"  It removes all watches, throws away any pending events, and deallocates "
+"all resources."
 msgstr ""
 
 #. type: =head2
@@ -9927,11 +9924,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1854
 msgid ""
-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>, "
-"then the kernel (or previously set)  default is used.  For Linux 2.6.29 the "
-"default was 16384 events.  Beyond this limit, the kernel throws away events, "
-"but records the fact that it threw them away by setting a flag "
+"C<maxevents> is the maximum number of events which will be queued up between"
+" calls to L</inotify-read> or L</inotify-files>.  If this is passed as C<0>,"
+" then the kernel (or previously set)  default is used.  For Linux 2.6.29 the"
+" default was 16384 events.  Beyond this limit, the kernel throws away "
+"events, but records the fact that it threw them away by setting a flag "
 "C<IN_Q_OVERFLOW> in the returned structure list (see L</inotify-read>)."
 msgstr ""
 
@@ -9939,16 +9936,16 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:1864
 msgid ""
 "Before any events are generated, you have to add some watches to the "
-"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and "
-"L</inotify-watch-all>."
+"internal watch list.  See: L</inotify-add-watch>, L</inotify-rm-watch> and L"
+"</inotify-watch-all>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1870
 msgid ""
-"Queued up events should be read periodically by calling L</inotify-read> (or "
-"L</inotify-files> which is just a helpful wrapper around L</inotify-read>).  "
-"If you don't read the events out often enough then you risk the internal "
+"Queued up events should be read periodically by calling L</inotify-read> (or"
+" L</inotify-files> which is just a helpful wrapper around L</inotify-read>)."
+"  If you don't read the events out often enough then you risk the internal "
 "queue overflowing."
 msgstr ""
 
@@ -9997,10 +9994,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:1895 ../src/guestfs-actions.pod:3002
 msgid ""
-"I<Note>: In order to make sure that all events have been read, you must call "
-"this function repeatedly until it returns an empty list.  The reason is that "
-"the call will read events up to the maximum appliance-to-host message size "
-"and leave remaining events in the queue."
+"I<Note>: In order to make sure that all events have been read, you must call"
+" this function repeatedly until it returns an empty list.  The reason is "
+"that the call will read events up to the maximum appliance-to-host message "
+"size and leave remaining events in the queue."
 msgstr ""
 
 #. type: =head2
@@ -10288,8 +10285,8 @@ msgstr "\"windows\""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2006 ../src/guestfs-actions.pod:3134
 msgid ""
-"Windows does not have distributions.  This string is returned if the OS type "
-"is Windows."
+"Windows does not have distributions.  This string is returned if the OS type"
+" is Windows."
 msgstr ""
 
 #. type: textblock
@@ -10318,8 +10315,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2020 ../src/guestfs-actions.pod:3155
 msgid ""
 "This call is useful for Windows which uses a primitive system of assigning "
-"drive letters (like \"C:\") to partitions.  This inspection API examines the "
-"Windows Registry to find out how disks/partitions are mapped to drive "
+"drive letters (like \"C:\") to partitions.  This inspection API examines the"
+" Windows Registry to find out how disks/partitions are mapped to drive "
 "letters, and returns a hash table as in the example below:"
 msgstr ""
 
@@ -10346,8 +10343,8 @@ msgstr ""
 msgid ""
 "In future we may support other operating systems that also used drive "
 "letters, but the keys for those might not be case insensitive and might be "
-"longer than 1 character.  For example in OS-9, hard drives were named C<h0>, "
-"C<h1> etc."
+"longer than 1 character.  For example in OS-9, hard drives were named C<h0>,"
+" C<h1> etc."
 msgstr ""
 
 #. type: textblock
@@ -10389,16 +10386,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2053 ../src/guestfs-actions.pod:3198
 msgid ""
-"This returns a list of all the filesystems that we think are associated with "
-"this operating system.  This includes the root filesystem, other ordinary "
+"This returns a list of all the filesystems that we think are associated with"
+" this operating system.  This includes the root filesystem, other ordinary "
 "filesystems, and non-mounted devices like swap partitions."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2058 ../src/guestfs-actions.pod:3203
 msgid ""
-"In the case of a multi-boot virtual machine, it is possible for a filesystem "
-"to be shared between operating systems."
+"In the case of a multi-boot virtual machine, it is possible for a filesystem"
+" to be shared between operating systems."
 msgstr ""
 
 #. type: textblock
@@ -10508,8 +10505,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2111 ../src/guestfs-actions.pod:3288
 msgid ""
 "This function returns an icon corresponding to the inspected operating "
-"system.  The icon is returned as a buffer containing a PNG image (re-encoded "
-"to PNG if necessary)."
+"system.  The icon is returned as a buffer containing a PNG image (re-encoded"
+" to PNG if necessary)."
 msgstr ""
 
 #. type: textblock
@@ -10540,15 +10537,15 @@ msgstr ""
 msgid ""
 "If the optional C<highquality> boolean is true then only high quality icons "
 "are returned, which means only icons of high resolution with an alpha "
-"channel.  The default (false) is to return any icon we can, even if it is of "
-"substandard quality."
+"channel.  The default (false) is to return any icon we can, even if it is of"
+" substandard quality."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2138 ../src/guestfs-actions.pod:3315
 msgid ""
-"Unlike most other inspection API calls, the guest's disks must be mounted up "
-"before you call this, since it needs to read information from the guest "
+"Unlike most other inspection API calls, the guest's disks must be mounted up"
+" before you call this, since it needs to read information from the guest "
 "filesystem during the call."
 msgstr ""
 
@@ -10557,15 +10554,15 @@ msgstr ""
 msgid ""
 "B<Security:> The icon data comes from the untrusted guest, and should be "
 "treated with caution.  PNG files have been known to contain exploits.  "
-"Ensure that libpng (or other relevant libraries) are fully up to date before "
-"trying to process or display the icon."
+"Ensure that libpng (or other relevant libraries) are fully up to date before"
+" trying to process or display the icon."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2152 ../src/guestfs-actions.pod:3329
 msgid ""
-"The PNG image returned can be any size.  It might not be square.  Libguestfs "
-"tries to return the largest, highest quality icon available.  The "
+"The PNG image returned can be any size.  It might not be square.  Libguestfs"
+" tries to return the largest, highest quality icon available.  The "
 "application must scale the icon to the required size."
 msgstr ""
 
@@ -10609,11 +10606,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2180 ../src/guestfs-actions.pod:3387
 msgid ""
-"Windows uses a consistent versioning scheme which is I<not> reflected in the "
-"popular public names used by the operating system.  Notably the operating "
+"Windows uses a consistent versioning scheme which is I<not> reflected in the"
+" popular public names used by the operating system.  Notably the operating "
 "system known as \"Windows 7\" is really version 6.1 (ie. major = 6, minor = "
-"1).  You can find out the real versions corresponding to releases of Windows "
-"by consulting Wikipedia or MSDN."
+"1).  You can find out the real versions corresponding to releases of Windows"
+" by consulting Wikipedia or MSDN."
 msgstr ""
 
 #. type: textblock
@@ -10670,10 +10667,10 @@ msgstr ""
 msgid ""
 "This returns a hash of where we think the filesystems associated with this "
 "operating system should be mounted.  Callers should note that this is at "
-"best an educated guess made by reading configuration files such as C</etc/"
-"fstab>.  I<In particular note> that this may return filesystems which are "
-"non-existent or not mountable and callers should be prepared to handle or "
-"ignore failures if they try to mount them."
+"best an educated guess made by reading configuration files such as "
+"C</etc/fstab>.  I<In particular note> that this may return filesystems which"
+" are non-existent or not mountable and callers should be prepared to handle "
+"or ignore failures if they try to mount them."
 msgstr ""
 
 #. type: textblock
@@ -10695,8 +10692,8 @@ msgstr ""
 msgid ""
 "For operating systems like Windows which still use drive letters, this call "
 "will only return an entry for the first drive \"mounted on\" C</>.  For "
-"information about the mapping of drive letters to partitions, see L</inspect-"
-"get-drive-mappings>."
+"information about the mapping of drive letters to partitions, see L"
+"</inspect-get-drive-mappings>."
 msgstr ""
 
 #. type: textblock
@@ -10773,8 +10770,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2263 ../src/guestfs-actions.pod:3499
 msgid ""
 "This returns the string C<unknown> if we could not determine the package "
-"management tool I<or> if the operating system does not have a real packaging "
-"system (eg. Windows)."
+"management tool I<or> if the operating system does not have a real packaging"
+" system (eg. Windows)."
 msgstr ""
 
 #. type: textblock
@@ -10804,8 +10801,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2278 ../src/guestfs-actions.pod:3521
 msgid ""
 "This returns the product name of the inspected operating system.  The "
-"product name is generally some freeform string which can be displayed to the "
-"user, but should not be parsed by programs."
+"product name is generally some freeform string which can be displayed to the"
+" user, but should not be parsed by programs."
 msgstr ""
 
 #. type: textblock
@@ -10836,11 +10833,11 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2295 ../src/guestfs-actions.pod:3545
 msgid ""
-"For Windows guests, this returns the contents of the Registry key C<HKLM"
-"\\Software\\Microsoft\\Windows NT\\CurrentVersion> C<InstallationType> which "
-"is usually a string such as C<Client> or C<Server> (other values are "
-"possible).  This can be used to distinguish consumer and enterprise versions "
-"of Windows that have the same version number (for example, Windows 7 and "
+"For Windows guests, this returns the contents of the Registry key "
+"C<HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion> C<InstallationType>"
+" which is usually a string such as C<Client> or C<Server> (other values are "
+"possible).  This can be used to distinguish consumer and enterprise versions"
+" of Windows that have the same version number (for example, Windows 7 and "
 "Windows 2008 Server are both version 6.1, but the former is C<Client> and "
 "the latter is C<Server>)."
 msgstr ""
@@ -11011,8 +11008,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2384 ../src/guestfs-actions.pod:3662
 msgid ""
-"This call assumes that the guest is Windows and that the systemroot could be "
-"determined by inspection.  If this is not the case then an error is returned."
+"This call assumes that the guest is Windows and that the systemroot could be"
+" determined by inspection.  If this is not the case then an error is "
+"returned."
 msgstr ""
 
 #. type: =head2
@@ -11106,9 +11104,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2428
 msgid ""
-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, "
-"then mount up the disks, before calling this.  Listing applications is a "
+"I<Note:> This call works differently from other parts of the inspection API."
+"  You have to call L</inspect-os>, then L</inspect-get-mountpoints>, then "
+"mount up the disks, before calling this.  Listing applications is a "
 "significantly more difficult operation which requires access to the full "
 "filesystem.  Also note that unlike the other L</inspect-get-*> calls which "
 "are just returning data cached in the libguestfs handle, this call actually "
@@ -11154,8 +11152,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2455 ../src/guestfs-actions.pod:3758
 msgid ""
-"If unavailable this is returned as an empty string C<\"\">.  Callers needing "
-"to display something can use C<app_name> instead."
+"If unavailable this is returned as an empty string C<\"\">.  Callers needing"
+" to display something can use C<app_name> instead."
 msgstr ""
 
 #. type: =item
@@ -11316,25 +11314,25 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2528 ../src/guestfs-actions.pod:3838
 msgid ""
 "If one operating system was found, then this returns a list with a single "
-"element, which is the name of the root filesystem of this operating system.  "
-"It is also possible for this function to return a list containing more than "
-"one element, indicating a dual-boot or multi-boot virtual machine, with each "
-"element being the root filesystem of one of the operating systems."
+"element, which is the name of the root filesystem of this operating system."
+"  It is also possible for this function to return a list containing more "
+"than one element, indicating a dual-boot or multi-boot virtual machine, with"
+" each element being the root filesystem of one of the operating systems."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2535
 msgid ""
 "You can pass the root string(s) returned to other L</inspect-get-*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+"functions in order to query further information about each operating system,"
+" such as the name and version."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2540
 msgid ""
-"This function uses other libguestfs features such as L</mount-ro> and L</"
-"umount-all> in order to mount and unmount filesystems and look at the "
+"This function uses other libguestfs features such as L</mount-ro> and L"
+"</umount-all> in order to mount and unmount filesystems and look at the "
 "contents.  This should be called with no disks currently mounted.  The "
 "function may also use Augeas, so any existing Augeas handle will be closed."
 msgstr ""
@@ -11342,8 +11340,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2546 ../src/guestfs-actions.pod:3856
 msgid ""
-"This function cannot decrypt encrypted disks.  The caller must do that first "
-"(supplying the necessary keys) if the disk is encrypted."
+"This function cannot decrypt encrypted disks.  The caller must do that first"
+" (supplying the necessary keys) if the disk is encrypted."
 msgstr ""
 
 #. type: textblock
@@ -11511,7 +11509,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2613 ../src/guestfs-actions.pod:3965
 msgid ""
 "This returns C<true> if and only if there is a regular file with the given "
-"C<path> name.  Note that it returns false for other objects like directories."
+"C<path> name.  Note that it returns false for other objects like "
+"directories."
 msgstr ""
 
 #. type: =head2
@@ -11739,9 +11738,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2699
 msgid ""
-"Change the file owner to C<owner> and group to C<group>.  This is like L</"
-"chown> but if C<path> is a symlink then the link itself is changed, not the "
-"target."
+"Change the file owner to C<owner> and group to C<group>.  This is like "
+"L</chown> but if C<path> is a symlink then the link itself is changed, not "
+"the target."
 msgstr ""
 
 #. type: =head2
@@ -11762,8 +11761,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2711 ../src/guestfs-actions.pod:4132
 msgid ""
-"Get a single extended attribute from file C<path> named C<name>.  If C<path> "
-"is a symlink, then this call returns an extended attribute from the symlink."
+"Get a single extended attribute from file C<path> named C<name>.  If C<path>"
+" is a symlink, then this call returns an extended attribute from the "
+"symlink."
 msgstr ""
 
 #. type: textblock
@@ -11914,16 +11914,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2782 ../src/guestfs-actions.pod:4239
 msgid ""
-"The value can have the special value \"unknown\", meaning the content of the "
-"device is undetermined or empty.  \"swap\" means a Linux swap partition."
+"The value can have the special value \"unknown\", meaning the content of the"
+" device is undetermined or empty.  \"swap\" means a Linux swap partition."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2786
 msgid ""
 "This command runs other libguestfs commands, which might include L</mount> "
-"and L</umount>, and therefore you should use this soon after launch and only "
-"when nothing is mounted."
+"and L</umount>, and therefore you should use this soon after launch and only"
+" when nothing is mounted."
 msgstr ""
 
 #. type: textblock
@@ -11964,8 +11964,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2806
 msgid ""
-"This does not return logical volumes.  For that you will need to call L</"
-"lvs>."
+"This does not return logical volumes.  For that you will need to call "
+"L</lvs>."
 msgstr ""
 
 #. type: =head2
@@ -12097,8 +12097,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2851
 msgid ""
-"This is the same as L</removexattr>, but if C<path> is a symbolic link, then "
-"it removes an extended attribute of the link itself."
+"This is the same as L</removexattr>, but if C<path> is a symbolic link, then"
+" it removes an extended attribute of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -12120,7 +12120,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2859 ../src/guestfs-actions.pod:4375
 msgid ""
 "List the files in C<directory> (relative to the root directory, there is no "
-"cwd).  The '.' and '..' entries are not returned, but hidden files are shown."
+"cwd).  The '.' and '..' entries are not returned, but hidden files are "
+"shown."
 msgstr ""
 
 #. type: textblock
@@ -12146,8 +12147,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2870
 msgid ""
-"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it "
-"sets an extended attribute of the link itself."
+"This is the same as L</setxattr>, but if C<path> is a symbolic link, then it"
+" sets an extended attribute of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -12174,8 +12175,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2880
 msgid ""
-"This is the same as L</stat> except that if C<path> is a symbolic link, then "
-"the link is stat-ed, not the file it refers to."
+"This is the same as L</stat> except that if C<path> is a symbolic link, then"
+" the link is stat-ed, not the file it refers to."
 msgstr ""
 
 #. type: textblock
@@ -12200,8 +12201,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2890
 msgid ""
 "This call allows you to perform the L</lstat> operation on multiple files, "
-"where all files are in the directory C<path>.  C<names> is the list of files "
-"from this directory."
+"where all files are in the directory C<path>.  C<names> is the list of files"
+" from this directory."
 msgstr ""
 
 #. type: textblock
@@ -12215,8 +12216,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2899
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lxattrlist> for a "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also L</lxattrlist> for a "
 "similarly efficient call for getting extended attributes.  Very long "
 "directory listings might cause the protocol message size to be exceeded, "
 "causing this call to fail.  The caller must split up such requests into "
@@ -12240,15 +12241,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:2911 ../src/guestfs-actions.pod:4464
 msgid ""
 "This command adds a new key on LUKS device C<device>.  C<key> is any "
-"existing key, and is used to access the device.  C<newkey> is the new key to "
-"add.  C<keyslot> is the key slot that will be replaced."
+"existing key, and is used to access the device.  C<newkey> is the new key to"
+" add.  C<keyslot> is the key slot that will be replaced."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2916
 msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use L</luks-kill-slot> first to remove that key."
+"Note that if C<keyslot> already contains a key, then this command will fail."
+"  You have to use L</luks-kill-slot> first to remove that key."
 msgstr ""
 
 #. type: textblock
@@ -12278,10 +12279,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:2927
 msgid ""
-"This closes a LUKS device that was created earlier by L</luks-open> or L</"
-"luks-open-ro>.  The C<device> parameter must be the name of the LUKS mapping "
-"device (ie. C</dev/mapper/mapname>) and I<not> the name of the underlying "
-"block device."
+"This closes a LUKS device that was created earlier by L</luks-open> or L"
+"</luks-open-ro>.  The C<device> parameter must be the name of the LUKS "
+"mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
+"underlying block device."
 msgstr ""
 
 #. type: =head2
@@ -12316,8 +12317,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:7028 ../src/guestfs-actions.pod:7058
 #: ../src/guestfs-actions.pod:7091 ../src/guestfs-actions.pod:8290
 msgid ""
-"B<This command is dangerous.  Without careful use you can easily destroy all "
-"your data>."
+"B<This command is dangerous.  Without careful use you can easily destroy all"
+" your data>."
 msgstr ""
 
 #. type: =head2
@@ -12428,7 +12429,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3002
 msgid ""
-"This is the same as L</luks-open> except that a read-only mapping is created."
+"This is the same as L</luks-open> except that a read-only mapping is "
+"created."
 msgstr ""
 
 #. type: =head2
@@ -12468,15 +12470,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3019 ../src/guestfs-actions.pod:4639
 msgid ""
 "This converts alternative naming schemes for LVs that you might find to the "
-"canonical name.  For example, C</dev/mapper/VG-LV> is converted to C</dev/VG/"
-"LV>."
+"canonical name.  For example, C</dev/mapper/VG-LV> is converted to "
+"C</dev/VG/LV>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3023 ../src/guestfs-actions.pod:4643
 msgid ""
-"This command returns an error if the C<lvname> parameter does not refer to a "
-"logical volume."
+"This command returns an error if the C<lvname> parameter does not refer to a"
+" logical volume."
 msgstr ""
 
 #. type: textblock
@@ -12502,8 +12504,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3032
 msgid ""
-"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every "
-"block device."
+"This undoes the effect of L</lvm-set-filter>.  LVM will be able to see every"
+" block device."
 msgstr ""
 
 #. type: textblock
@@ -12553,8 +12555,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3052 ../src/guestfs-actions.pod:4689
 msgid ""
-"This sets the LVM device filter so that LVM will only be able to \"see\" the "
-"block devices in the list C<devices>, and will ignore all other attached "
+"This sets the LVM device filter so that LVM will only be able to \"see\" the"
+" block devices in the list C<devices>, and will ignore all other attached "
 "block devices."
 msgstr ""
 
@@ -12562,10 +12564,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3056 ../src/guestfs-actions.pod:4693
 msgid ""
 "Where disk image(s) contain duplicate PVs or VGs, this command is useful to "
-"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also "
-"there are two types of duplication possible: either cloned PVs/VGs which "
-"have identical UUIDs; or VGs that are not cloned but just happen to have the "
-"same name.  In normal operation you cannot create this situation, but you "
+"get LVM to ignore the duplicates, otherwise LVM can get confused.  Note also"
+" there are two types of duplication possible: either cloned PVs/VGs which "
+"have identical UUIDs; or VGs that are not cloned but just happen to have the"
+" same name.  In normal operation you cannot create this situation, but you "
 "can do it outside LVM, eg.  by cloning disk images or by bit twiddling "
 "inside the LVM metadata."
 msgstr ""
@@ -12607,8 +12609,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3082 ../src/guestfs-actions.pod:4725
 msgid ""
-"You can also remove all LVs in a volume group by specifying the VG name, C</"
-"dev/VG>."
+"You can also remove all LVs in a volume group by specifying the VG name, "
+"C</dev/VG>."
 msgstr ""
 
 #. type: =head2
@@ -12665,10 +12667,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3103 ../src/guestfs-actions.pod:4767
 msgid ""
-"This expands an existing logical volume C<lv> so that it fills C<pc>% of the "
-"remaining free space in the volume group.  Commonly you would call this with "
-"pc = 100 which expands the logical volume as much as possible, using all "
-"remaining free space in the volume group."
+"This expands an existing logical volume C<lv> so that it fills C<pc>% of the"
+" remaining free space in the volume group.  Commonly you would call this "
+"with pc = 100 which expands the logical volume as much as possible, using "
+"all remaining free space in the volume group."
 msgstr ""
 
 #. type: =head2
@@ -12689,15 +12691,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3113 ../src/guestfs-actions.pod:4782
 msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command."
+"List all the logical volumes detected.  This is the equivalent of the "
+"L<lvs(8)> command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3116 ../src/guestfs-actions.pod:4785
 msgid ""
-"This returns a list of the logical volume device names (eg. C</dev/"
-"VolGroup00/LogVol00>)."
+"This returns a list of the logical volume device names (eg. "
+"C</dev/VolGroup00/LogVol00>)."
 msgstr ""
 
 #. type: textblock
@@ -12723,8 +12725,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3125 ../src/guestfs-actions.pod:4801
 msgid ""
-"List all the logical volumes detected.  This is the equivalent of the L<lvs"
-"(8)> command.  The \"full\" version includes all fields."
+"List all the logical volumes detected.  This is the equivalent of the "
+"L<lvs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -12763,32 +12765,33 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3138 ../src/guestfs-actions.pod:4830
 msgid ""
-"This call allows you to get the extended attributes of multiple files, where "
-"all files are in the directory C<path>.  C<names> is the list of files from "
-"this directory."
+"This call allows you to get the extended attributes of multiple files, where"
+" all files are in the directory C<path>.  C<names> is the list of files from"
+" this directory."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3142 ../src/guestfs-actions.pod:4834
 msgid ""
 "On return you get a flat list of xattr structs which must be interpreted "
-"sequentially.  The first xattr struct always has a zero-length C<attrname>.  "
-"C<attrval> in this struct is zero-length to indicate there was an error "
+"sequentially.  The first xattr struct always has a zero-length C<attrname>."
+"  C<attrval> in this struct is zero-length to indicate there was an error "
 "doing C<lgetxattr> for this file, I<or> is a C string which is a decimal "
-"number (the number of following attributes for this file, which could be C<"
-"\"0\">).  Then after the first xattr struct are the zero or more attributes "
-"for the first named file.  This repeats for the second and subsequent files."
+"number (the number of following attributes for this file, which could be "
+"C<\"0\">).  Then after the first xattr struct are the zero or more "
+"attributes for the first named file.  This repeats for the second and "
+"subsequent files."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3152
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also L</lstatlist> for a "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also L</lstatlist> for a "
 "similarly efficient call for getting standard stats.  Very long directory "
 "listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
+"call to fail.  The caller must split up such requests into smaller groups of"
+" names."
 msgstr ""
 
 #. type: =head2
@@ -12894,8 +12897,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3195 ../src/guestfs-actions.pod:4914
 msgid ""
-"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one "
-"being suitable for Windows filesystems."
+"For example: \"/tmp/myprogXXXXXX\" or \"/Temp/myprogXXXXXX\", the second one"
+" being suitable for Windows filesystems."
 msgstr ""
 
 #. type: textblock
@@ -12905,7 +12908,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3201 ../src/guestfs-actions.pod:4920
-msgid "The temporary directory is created with mode 0700 and is owned by root."
+msgid ""
+"The temporary directory is created with mode 0700 and is owned by root."
 msgstr ""
 
 #. type: textblock
@@ -12936,8 +12940,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3213 ../src/guestfs-actions.pod:4942
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"C<journal>.  It is equivalent to the command:"
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" C<journal>.  It is equivalent to the command:"
 msgstr ""
 
 #. type: verbatim
@@ -12971,8 +12975,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3225 ../src/guestfs-actions.pod:4963
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal labeled C<label>."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" the journal labeled C<label>."
 msgstr ""
 
 #. type: textblock
@@ -12996,8 +13000,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:4981
 msgid ""
-"This creates an ext2/3/4 filesystem on C<device> with an external journal on "
-"the journal with UUID C<uuid>."
+"This creates an ext2/3/4 filesystem on C<device> with an external journal on"
+" the journal with UUID C<uuid>."
 msgstr ""
 
 #. type: textblock
@@ -13021,8 +13025,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3243 ../src/guestfs-actions.pod:4997
 msgid ""
-"This creates an ext2 external journal on C<device>.  It is equivalent to the "
-"command:"
+"This creates an ext2 external journal on C<device>.  It is equivalent to the"
+" command:"
 msgstr ""
 
 #. type: verbatim
@@ -13048,7 +13052,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3252 ../src/guestfs-actions.pod:5014
-msgid "This creates an ext2 external journal on C<device> with label C<label>."
+msgid ""
+"This creates an ext2 external journal on C<device> with label C<label>."
 msgstr ""
 
 #. type: =head2
@@ -13207,8 +13212,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3327 ../src/guestfs-actions.pod:5137
 msgid ""
-"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem "
-"type."
+"You cannot use this optional parameter with the C<gfs> or C<gfs2> filesystem"
+" type."
 msgstr ""
 
 #. type: =item
@@ -13251,15 +13256,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3348
 msgid ""
-"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used "
-"to create extra mountpoints before mounting the first filesystem."
+"L</mkmountpoint> and L</rmmountpoint> are specialized calls that can be used"
+" to create extra mountpoints before mounting the first filesystem."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3352 ../src/guestfs-actions.pod:5190
 msgid ""
-"These calls are I<only> necessary in some very limited circumstances, mainly "
-"the case where you want to mount a mix of unrelated and/or read-only "
+"These calls are I<only> necessary in some very limited circumstances, mainly"
+" the case where you want to mount a mix of unrelated and/or read-only "
 "filesystems together."
 msgstr ""
 
@@ -13325,9 +13330,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3383
 msgid ""
-"Autosync [see L</set-autosync>, this is set by default on handles] can cause "
-"L</umount-all> to be called when the handle is closed which can also trigger "
-"these issues."
+"Autosync [see L</set-autosync>, this is set by default on handles] can cause"
+" L</umount-all> to be called when the handle is closed which can also "
+"trigger these issues."
 msgstr ""
 
 #. type: =head2
@@ -13346,7 +13351,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3391 ../src/guestfs-actions.pod:5238
 msgid ""
-"This call creates block or character special devices, or named pipes (FIFOs)."
+"This call creates block or character special devices, or named pipes "
+"(FIFOs)."
 msgstr ""
 
 #. type: textblock
@@ -13453,9 +13459,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3441 ../src/guestfs-actions.pod:5319
 msgid ""
-"Note that you cannot attach a swap label to a block device (eg. C</dev/"
-"sda>), just to a partition.  This appears to be a limitation of the kernel "
-"or swap tools."
+"Note that you cannot attach a swap label to a block device (eg. "
+"C</dev/sda>), just to a partition.  This appears to be a limitation of the "
+"kernel or swap tools."
 msgstr ""
 
 #. type: =head2
@@ -13550,8 +13556,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3473 ../src/guestfs-actions.pod:5377
 msgid ""
-"Mount a guest disk at a position in the filesystem.  Block devices are named "
-"C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
+"Mount a guest disk at a position in the filesystem.  Block devices are named"
+" C</dev/sda>, C</dev/sdb> and so on, as they were added to the guest.  If "
 "those block devices contain partitions, they will have the usual names (eg. "
 "C</dev/sda1>).  Also LVM C</dev/VG/LV>-style names can be used."
 msgstr ""
@@ -13560,15 +13566,15 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3479 ../src/guestfs-actions.pod:5383
 msgid ""
 "The rules are the same as for L<mount(2)>: A filesystem must first be "
-"mounted on C</> before others can be mounted.  Other filesystems can only be "
-"mounted on directories which already exist."
+"mounted on C</> before others can be mounted.  Other filesystems can only be"
+" mounted on directories which already exist."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3484 ../src/guestfs-actions.pod:5388
 msgid ""
-"The mounted filesystem is writable, if we have sufficient permissions on the "
-"underlying device."
+"The mounted filesystem is writable, if we have sufficient permissions on the"
+" underlying device."
 msgstr ""
 
 #. type: textblock
@@ -13675,8 +13681,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3531
 msgid ""
-"This is the same as the L</mount> command, but it mounts the filesystem with "
-"the read-only (I<-o ro>) flag."
+"This is the same as the L</mount> command, but it mounts the filesystem with"
+" the read-only (I<-o ro>) flag."
 msgstr ""
 
 #. type: =head2
@@ -13695,8 +13701,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3538
 msgid ""
-"This is the same as the L</mount> command, but it allows you to set both the "
-"mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
+"This is the same as the L</mount> command, but it allows you to set both the"
+" mount options and the vfstype as for the L<mount(8)> I<-o> and I<-t> flags."
 msgstr ""
 
 #. type: =head2
@@ -13740,8 +13746,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3554 ../src/guestfs-actions.pod:5540
 msgid ""
-"This returns the list of currently mounted filesystems.  It returns the list "
-"of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."
+"This returns the list of currently mounted filesystems.  It returns the list"
+" of devices (eg. C</dev/sda1>, C</dev/VG/LV>)."
 msgstr ""
 
 #. type: textblock
@@ -13808,8 +13814,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3580 ../src/guestfs-actions.pod:5582
 msgid ""
-"The return value is an integer which C<0> if the operation would succeed, or "
-"some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."
+"The return value is an integer which C<0> if the operation would succeed, or"
+" some non-zero value documented in the L<ntfs-3g.probe(8)> manual page."
 msgstr ""
 
 #. type: =head2
@@ -13838,8 +13844,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3591 ../src/guestfs-actions.pod:5606
 msgid ""
-"I<Note:> After the resize operation, the filesystem is marked as requiring a "
-"consistency check (for safety).  You have to boot into Windows to perform "
+"I<Note:> After the resize operation, the filesystem is marked as requiring a"
+" consistency check (for safety).  You have to boot into Windows to perform "
 "this check and clear this condition.  Furthermore, ntfsresize refuses to "
 "resize filesystems which have been marked in this way.  So in effect it is "
 "not possible to call ntfsresize multiple times on a single filesystem "
@@ -13897,8 +13903,8 @@ msgid ""
 "After the resize operation, the filesystem is always marked as requiring a "
 "consistency check (for safety).  You have to boot into Windows to perform "
 "this check and clear this condition.  If you I<don't> set the C<force> "
-"option then it is not possible to call L</ntfsresize-opts> multiple times on "
-"a single filesystem without booting into Windows between each resize."
+"option then it is not possible to call L</ntfsresize-opts> multiple times on"
+" a single filesystem without booting into Windows between each resize."
 msgstr ""
 
 #. type: =head2
@@ -13944,8 +13950,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3663 ../src/guestfs-actions.pod:5722
 msgid ""
-"The C<prlogex> parameter is the type of partition.  Normally you should pass "
-"C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
+"The C<prlogex> parameter is the type of partition.  Normally you should pass"
+" C<p> or C<primary> here, but MBR partition tables also support C<l> (or "
 "C<logical>) and C<e> (or C<extended>) partition types."
 msgstr ""
 
@@ -13960,8 +13966,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3672
 msgid ""
-"Creating a partition which covers the whole disk is not so easy.  Use L</"
-"part-disk> to do that."
+"Creating a partition which covers the whole disk is not so easy.  Use L"
+"</part-disk> to do that."
 msgstr ""
 
 #. type: =head2
@@ -14014,8 +14020,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3693
 msgid ""
-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in L</part-init>."
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other"
+" possible values are described in L</part-init>."
 msgstr ""
 
 #. type: =head2
@@ -14066,8 +14072,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3715 ../fish/guestfish-actions.pod:3859
 msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see L</part-get-"
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get"
+" undefined results for other partition table types (see L</part-get-"
 "parttype>)."
 msgstr ""
 
@@ -14118,8 +14124,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3735 ../src/guestfs-actions.pod:5836
 msgid ""
 "This creates an empty partition table on C<device> of one of the partition "
-"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt> "
-"(for large disks)."
+"types listed below.  Usually C<parttype> should be either C<msdos> or C<gpt>"
+" (for large disks)."
 msgstr ""
 
 #. type: textblock
@@ -14171,8 +14177,8 @@ msgstr "B<msdos>"
 #: ../fish/guestfish-actions.pod:3760 ../src/guestfs-actions.pod:5861
 msgid ""
 "The standard PC \"Master Boot Record\" (MBR) format used by MS-DOS and "
-"Windows.  This partition type will B<only> work for device sizes up to 2 "
-"TB.  For large disks we recommend using C<gpt>."
+"Windows.  This partition type will B<only> work for device sizes up to 2 TB."
+"  For large disks we recommend using C<gpt>."
 msgstr ""
 
 #. type: textblock
@@ -14244,7 +14250,8 @@ msgstr "B<mac>"
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3796 ../src/guestfs-actions.pod:5897
 msgid "Old Mac partition format.  Modern Macs use C<gpt>."
-msgstr "Старий формат розділів Mac. Сучасні системи Mac використовують C<gpt>."
+msgstr ""
+"Старий формат розділів Mac. Сучасні системи Mac використовують C<gpt>."
 
 #. type: =item
 #: ../fish/guestfish-actions.pod:3798 ../src/guestfs-actions.pod:5899
@@ -14284,8 +14291,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3812 ../src/guestfs-actions.pod:5919
 msgid ""
-"This command parses the partition table on C<device> and returns the list of "
-"partitions found."
+"This command parses the partition table on C<device> and returns the list of"
+" partitions found."
 msgstr ""
 
 #. type: textblock
@@ -14379,8 +14386,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3853 ../src/guestfs-actions.pod:5978
 msgid ""
-"Sets the MBR type byte (also known as the ID byte) of the numbered partition "
-"C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
+"Sets the MBR type byte (also known as the ID byte) of the numbered partition"
+" C<partnum> to C<idbyte>.  Note that the type bytes quoted in most "
 "documentation are in fact hexadecimal numbers, but usually documented "
 "without any leading \"0x\" which might be confusing."
 msgstr ""
@@ -14437,36 +14444,27 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3881 ../fish/guestfish-actions.pod:3893
 msgid ""
-"The named partition must exist, for example as a string returned from L</"
-"list-partitions>."
+"The named partition must exist, for example as a string returned from L"
+"</list-partitions>."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3884
-#, fuzzy
-#| msgid "See also: L</part-add>"
 msgid "See also L</part-to-partnum>."
-msgstr "Див. також L</part-add>"
+msgstr ""
 
 #. type: =head2
 #: ../fish/guestfish-actions.pod:3886
-#, fuzzy
-#| msgid "part-get-parttype"
 msgid "part-to-partnum"
-msgstr "part-get-parttype"
+msgstr ""
 
 #. type: verbatim
 #: ../fish/guestfish-actions.pod:3888
-#, fuzzy, no-wrap
-#| msgid ""
-#| " part-to-dev partition\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " part-to-partnum partition\n"
 "\n"
 msgstr ""
-" part-to-dev розділ\n"
-"\n"
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3890 ../src/guestfs-actions.pod:6036
@@ -14477,10 +14475,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3896
-#, fuzzy
-#| msgid "See also: L</part-add>"
 msgid "See also L</part-to-dev>."
-msgstr "Див. також L</part-add>"
+msgstr ""
 
 #. type: =head2
 #: ../fish/guestfish-actions.pod:3898
@@ -14612,8 +14608,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:3952 ../src/guestfs-actions.pod:6135
 msgid ""
 "The implementation uses the C<pvremove> command which refuses to wipe "
-"physical volumes that contain any volume groups, so you have to remove those "
-"first."
+"physical volumes that contain any volume groups, so you have to remove those"
+" first."
 msgstr ""
 
 #. type: =head2
@@ -14676,15 +14672,15 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3974 ../src/guestfs-actions.pod:6175
 msgid ""
-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command."
+"List all the physical volumes detected.  This is the equivalent of the "
+"L<pvs(8)> command."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3977 ../src/guestfs-actions.pod:6178
 msgid ""
-"This returns a list of just the device names that contain PVs (eg. C</dev/"
-"sda2>)."
+"This returns a list of just the device names that contain PVs (eg. "
+"C</dev/sda2>)."
 msgstr ""
 
 #. type: textblock
@@ -14710,8 +14706,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3986 ../src/guestfs-actions.pod:6194
 msgid ""
-"List all the physical volumes detected.  This is the equivalent of the L<pvs"
-"(8)> command.  The \"full\" version includes all fields."
+"List all the physical volumes detected.  This is the equivalent of the "
+"L<pvs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -14750,8 +14746,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:3999 ../src/guestfs-actions.pod:6225
 msgid ""
-"This command writes to part of a file.  It writes the data buffer C<content> "
-"to the file C<path> starting at offset C<offset>."
+"This command writes to part of a file.  It writes the data buffer C<content>"
+" to the file C<path> starting at offset C<offset>."
 msgstr ""
 
 #. type: textblock
@@ -14793,8 +14789,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4020 ../src/guestfs-actions.pod:6255
 msgid ""
 "This command implements the L<pwrite(2)> system call, and like that system "
-"call it may not write the full data requested (although short writes to disk "
-"devices and partitions are probably impossible with standard Linux kernels)."
+"call it may not write the full data requested (although short writes to disk"
+" devices and partitions are probably impossible with standard Linux "
+"kernels)."
 msgstr ""
 
 #. type: textblock
@@ -15039,8 +15036,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4131 ../src/guestfs-actions.pod:6405
 msgid ""
-"On return you get a list of strings, with a one-to-one correspondence to the "
-"C<names> list.  Each string is the value of the symbolic link."
+"On return you get a list of strings, with a one-to-one correspondence to the"
+" C<names> list.  Each string is the value of the symbolic link."
 msgstr ""
 
 #. type: textblock
@@ -15048,16 +15045,16 @@ msgstr ""
 msgid ""
 "If the C<readlink(2)> operation fails on any name, then the corresponding "
 "result string is the empty string C<\"\">.  However the whole operation is "
-"completed even if there were C<readlink(2)> errors, and so you can call this "
-"function with names where you don't know if they are symbolic links already "
-"(albeit slightly less efficient)."
+"completed even if there were C<readlink(2)> errors, and so you can call this"
+" function with names where you don't know if they are symbolic links already"
+" (albeit slightly less efficient)."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4142 ../src/guestfs-actions.pod:6416
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  Very long directory listings "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  Very long directory listings "
 "might cause the protocol message size to be exceeded, causing this call to "
 "fail.  The caller must split up such requests into smaller groups of names."
 msgstr ""
@@ -15133,10 +15130,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4172
 msgid ""
-"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device> "
-"before calling this command.  For unknown reasons C<resize2fs> sometimes "
-"gives an error about this and sometimes not.  In any case, it is always safe "
-"to call L</e2fsck-f> before calling this function."
+"I<Note:> It is sometimes required that you run L</e2fsck-f> on the C<device>"
+" before calling this command.  For unknown reasons C<resize2fs> sometimes "
+"gives an error about this and sometimes not.  In any case, it is always safe"
+" to call L</e2fsck-f> before calling this function."
 msgstr ""
 
 #. type: =head2
@@ -15269,8 +15266,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4222
 msgid ""
-"This calls removes a mountpoint that was previously created with L</"
-"mkmountpoint>.  See L</mkmountpoint> for full details."
+"This calls removes a mountpoint that was previously created with "
+"L</mkmountpoint>.  See L</mkmountpoint> for full details."
 msgstr ""
 
 #. type: =head2
@@ -15349,8 +15346,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4255
 msgid ""
-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for L</scrub-file>, and "
+"This command creates the directory C<dir> and then fills it with files until"
+" the filesystem is full, and scrubs the files as for L</scrub-file>, and "
 "deletes them.  The intention is to scrub any free space on the partition "
 "containing C<dir>."
 msgstr ""
@@ -15521,7 +15518,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4333 ../src/guestfs-actions.pod:6700
-msgid "You probably don't want to use this unless you know what you are doing."
+msgid ""
+"You probably don't want to use this unless you know what you are doing."
 msgstr ""
 
 #. type: textblock
@@ -15646,8 +15644,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4387 ../src/guestfs-actions.pod:6776
 msgid ""
-"This affects whether commands are able to access the network (see L<guestfs"
-"(3)/RUNNING COMMANDS>)."
+"This affects whether commands are able to access the network (see "
+"L<guestfs(3)/RUNNING COMMANDS>)."
 msgstr ""
 
 #. type: textblock
@@ -15774,8 +15772,8 @@ msgid ""
 "Note that you should call this function as early as possible after creating "
 "the handle.  This is because some pre-launch operations depend on testing "
 "qemu features (by running C<qemu -help>).  If the qemu binary changes, we "
-"don't retest features, and so you might see inconsistent results.  Using the "
-"environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
+"don't retest features, and so you might see inconsistent results.  Using the"
+" environment variable C<LIBGUESTFS_QEMU> is safest of all since that picks "
 "the qemu binary at the same time as the handle is created."
 msgstr ""
 
@@ -15878,8 +15876,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4486 ../src/guestfs-actions.pod:6899
 msgid ""
-"Change the number of virtual CPUs assigned to the appliance.  The default is "
-"C<1>.  Increasing this may improve performance, though often it has no "
+"Change the number of virtual CPUs assigned to the appliance.  The default is"
+" C<1>.  Increasing this may improve performance, though often it has no "
 "effect."
 msgstr ""
 
@@ -15911,8 +15909,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4498 ../src/guestfs-actions.pod:6915
 msgid ""
-"If the command trace flag is set to 1, then libguestfs calls, parameters and "
-"return values are traced."
+"If the command trace flag is set to 1, then libguestfs calls, parameters and"
+" return values are traced."
 msgstr ""
 
 #. type: textblock
@@ -16056,18 +16054,19 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4555 ../src/guestfs-actions.pod:7008
 msgid ""
 "C<cyls>, C<heads> and C<sectors> are the number of cylinders, heads and "
-"sectors on the device, which are passed directly to sfdisk as the I<-C>, I<-"
-"H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
-"corresponding parameter is omitted.  Usually for 'large' disks, you can just "
-"pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather, "
-"the kernel) cannot work out the right geometry and you will need to tell it."
+"sectors on the device, which are passed directly to sfdisk as the I<-C>, "
+"I<-H> and I<-S> parameters.  If you pass C<0> for any of these, then the "
+"corresponding parameter is omitted.  Usually for 'large' disks, you can just"
+" pass C<0> for these, but for small (floppy-sized) disks, sfdisk (or rather,"
+" the kernel) cannot work out the right geometry and you will need to tell "
+"it."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4563 ../src/guestfs-actions.pod:7016
 msgid ""
-"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information "
-"refer to the L<sfdisk(8)> manpage."
+"C<lines> is a list of lines that we feed to C<sfdisk>.  For more information"
+" refer to the L<sfdisk(8)> manpage."
 msgstr ""
 
 #. type: textblock
@@ -16169,10 +16168,10 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4632
 msgid ""
-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see L</sfdisk-"
-"kernel-geometry>)."
+"This displays the disk geometry of C<device> read from the partition table."
+"  Especially in the case where the underlying block device has been resized,"
+" this can be different from the kernel's idea of the geometry (see L"
+"</sfdisk-kernel-geometry>)."
 msgstr ""
 
 #. type: textblock
@@ -16219,8 +16218,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4653 ../src/guestfs-actions.pod:7144
 msgid ""
-"This displays the partition table on C<device>, in the human-readable output "
-"of the L<sfdisk(8)> command.  It is not intended to be parsed."
+"This displays the partition table on C<device>, in the human-readable output"
+" of the L<sfdisk(8)> command.  It is not intended to be parsed."
 msgstr ""
 
 #. type: textblock
@@ -16253,8 +16252,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4670 ../src/guestfs-actions.pod:7161
 msgid ""
-"This call runs a command from the guest filesystem via the guest's C</bin/"
-"sh>."
+"This call runs a command from the guest filesystem via the guest's "
+"C</bin/sh>."
 msgstr ""
 
 #. type: textblock
@@ -16299,7 +16298,8 @@ msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4687
-msgid "This is the same as L</sh>, but splits the result into a list of lines."
+msgid ""
+"This is the same as L</sh>, but splits the result into a list of lines."
 msgstr ""
 
 #. type: textblock
@@ -16366,8 +16366,8 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4710 ../src/guestfs-actions.pod:7230
 msgid ""
 "Returns file system statistics for any mounted file system.  C<path> should "
-"be a file or directory in the mounted file system (typically it is the mount "
-"point itself, but it doesn't need to be)."
+"be a file or directory in the mounted file system (typically it is the mount"
+" point itself, but it doesn't need to be)."
 msgstr ""
 
 #. type: textblock
@@ -16415,8 +16415,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4730
 msgid ""
-"This is like the L</strings> command, but allows you to specify the encoding "
-"of strings that are looked for in the source file C<path>."
+"This is like the L</strings> command, but allows you to specify the encoding"
+" of strings that are looked for in the source file C<path>."
 msgstr ""
 
 #. type: textblock
@@ -16453,7 +16453,8 @@ msgstr "b"
 
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4749 ../src/guestfs-actions.pod:7286
-msgid "16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
+msgid ""
+"16-bit big endian strings such as those encoded in UTF-16BE or UCS-2BE."
 msgstr ""
 
 #. type: =item
@@ -16575,8 +16576,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4797 ../src/guestfs-actions.pod:7360
 msgid ""
-"This command disables the libguestfs appliance swap partition with the given "
-"UUID."
+"This command disables the libguestfs appliance swap partition with the given"
+" UUID."
 msgstr ""
 
 #. type: =head2
@@ -16606,10 +16607,10 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:4809 ../src/guestfs-actions.pod:7378
 msgid ""
 "Note that you should not swap to existing guest swap partitions unless you "
-"know what you are doing.  They may contain hibernation information, or other "
-"information that the guest doesn't want you to trash.  You also risk leaking "
-"information about the host to the guest this way.  Instead, attach a new "
-"host device to the guest and swap on that."
+"know what you are doing.  They may contain hibernation information, or other"
+" information that the guest doesn't want you to trash.  You also risk "
+"leaking information about the host to the guest this way.  Instead, attach a"
+" new host device to the guest and swap on that."
 msgstr ""
 
 #. type: =head2
@@ -16673,8 +16674,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4834
 msgid ""
-"This command enables swap to a swap partition with the given UUID.  See L</"
-"swapon-device> for other notes."
+"This command enables swap to a swap partition with the given UUID.  See L"
+"</swapon-device> for other notes."
 msgstr ""
 
 #. type: =head2
@@ -16826,8 +16827,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4900 ../src/guestfs-actions.pod:7526
 msgid ""
-"This command uploads and unpacks local file C<tarball> (a I<gzip compressed> "
-"tar file) into C<directory>."
+"This command uploads and unpacks local file C<tarball> (a I<gzip compressed>"
+" tar file) into C<directory>."
 msgstr ""
 
 #. type: textblock
@@ -16963,8 +16964,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:4953 ../src/guestfs-actions.pod:7607
 msgid ""
-"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on "
-"C<device>."
+"This returns the contents of the ext2, ext3 or ext4 filesystem superblock on"
+" C<device>."
 msgstr ""
 
 #. type: textblock
@@ -16972,8 +16973,8 @@ msgstr ""
 msgid ""
 "It is the same as running C<tune2fs -l device>.  See L<tune2fs(8)> manpage "
 "for more details.  The list of fields returned isn't clearly defined, and "
-"depends on both the version of C<tune2fs> that libguestfs was built against, "
-"and the filesystem itself."
+"depends on both the version of C<tune2fs> that libguestfs was built against,"
+" and the filesystem itself."
 msgstr ""
 
 #. type: =head2
@@ -17262,9 +17263,9 @@ msgstr ""
 #: ../fish/guestfish-actions.pod:5084 ../src/guestfs-actions.pod:7801
 msgid ""
 "Note that because of dynamic linking this is not necessarily the version of "
-"libguestfs that you compiled against.  You can compile the program, and then "
-"at runtime dynamically link against a completely different C<libguestfs.so> "
-"library."
+"libguestfs that you compiled against.  You can compile the program, and then"
+" at runtime dynamically link against a completely different C<libguestfs.so>"
+" library."
 msgstr ""
 
 #. type: textblock
@@ -17279,8 +17280,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5095 ../src/guestfs-actions.pod:7812
 msgid ""
-"The call returns a structure with four elements.  The first three (C<major>, "
-"C<minor> and C<release>) are numbers and correspond to the usual version "
+"The call returns a structure with four elements.  The first three (C<major>,"
+" C<minor> and C<release>) are numbers and correspond to the usual version "
 "triplet.  The fourth element (C<extra>) is a string and is normally empty, "
 "but may be used for distro-specific information."
 msgstr ""
@@ -17598,8 +17599,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5217 ../src/guestfs-actions.pod:8011
 msgid ""
-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command."
+"List all the volumes groups detected.  This is the equivalent of the "
+"L<vgs(8)> command."
 msgstr ""
 
 #. type: textblock
@@ -17632,8 +17633,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5229 ../src/guestfs-actions.pod:8030
 msgid ""
-"List all the volumes groups detected.  This is the equivalent of the L<vgs(8)"
-"> command.  The \"full\" version includes all fields."
+"List all the volumes groups detected.  This is the equivalent of the "
+"L<vgs(8)> command.  The \"full\" version includes all fields."
 msgstr ""
 
 #. type: =head2
@@ -17716,7 +17717,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5256 ../src/guestfs-actions.pod:8110
 msgid ""
-"This command counts the lines in a file, using the C<wc -l> external command."
+"This command counts the lines in a file, using the C<wc -l> external "
+"command."
 msgstr ""
 
 #. type: =head2
@@ -17737,7 +17739,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5263 ../src/guestfs-actions.pod:8123
 msgid ""
-"This command counts the words in a file, using the C<wc -w> external command."
+"This command counts the words in a file, using the C<wc -w> external "
+"command."
 msgstr ""
 
 #. type: =head2
@@ -17932,8 +17935,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5356
 msgid ""
-"This command writes zeroes over the entire C<device>.  Compare with L</zero> "
-"which just zeroes the first few blocks of a device."
+"This command writes zeroes over the entire C<device>.  Compare with L</zero>"
+" which just zeroes the first few blocks of a device."
 msgstr ""
 
 #. type: =head2
@@ -17954,8 +17957,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-actions.pod:5371 ../src/guestfs-actions.pod:8301
 msgid ""
-"This runs the I<zerofree> program on C<device>.  This program claims to zero "
-"unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
+"This runs the I<zerofree> program on C<device>.  This program claims to zero"
+" unused inodes and disk blocks on an ext2/3 filesystem, thus making it "
 "possible to compress the filesystem more effectively."
 msgstr ""
 
@@ -18153,8 +18156,8 @@ msgstr ""
 msgid ""
 "C<copy-in> copies local files or directories recursively into the disk "
 "image, placing them in the directory called C</remotedir> (which must "
-"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and "
-"other commands as necessary."
+"exist).  This guestfish meta-command turns into a sequence of L</tar-in> and"
+" other commands as necessary."
 msgstr ""
 
 #. type: textblock
@@ -18181,9 +18184,9 @@ msgstr ""
 #: ../fish/guestfish-commands.pod:34
 msgid ""
 "C<copy-out> copies remote files or directories recursively out of the disk "
-"image, placing them on the host disk in a local directory called C<localdir> "
-"(which must exist).  This guestfish meta-command turns into a sequence of L</"
-"download>, L</tar-out> and other commands as necessary."
+"image, placing them on the host disk in a local directory called C<localdir>"
+" (which must exist).  This guestfish meta-command turns into a sequence of "
+"L</download>, L</tar-out> and other commands as necessary."
 msgstr ""
 
 #. type: textblock
@@ -18397,7 +18400,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-commands.pod:116
 msgid ""
-"which would allow you to edit anywhere within the first megabyte of the disk."
+"which would allow you to edit anywhere within the first megabyte of the "
+"disk."
 msgstr ""
 
 #. type: textblock
@@ -18588,8 +18592,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish-commands.pod:184
 msgid ""
-"This creates an empty sparse file of the given size, and then adds so it can "
-"be further examined."
+"This creates an empty sparse file of the given size, and then adds so it can"
+" be further examined."
 msgstr ""
 
 #. type: textblock
@@ -18621,7 +18625,8 @@ msgstr ""
 #: ../fish/guestfish-commands.pod:201
 msgid ""
 "This command returns a list of the optional groups known to the daemon, and "
-"indicates which ones are supported by this build of the libguestfs appliance."
+"indicates which ones are supported by this build of the libguestfs "
+"appliance."
 msgstr ""
 
 #. type: textblock
@@ -18732,9 +18737,9 @@ msgstr ""
 #: ../fish/guestfish.pod:25
 msgid ""
 "Using guestfish in read/write mode on live virtual machines can be "
-"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only) "
-"option to use guestfish safely if the disk image or virtual machine might be "
-"live."
+"dangerous, potentially causing disk corruption.  Use the I<--ro> (read-only)"
+" option to use guestfish safely if the disk image or virtual machine might "
+"be live."
 msgstr ""
 
 #. type: textblock
@@ -18904,7 +18909,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:109
 msgid ""
-"Use the I<-i> option to automatically mount the disks from a virtual machine:"
+"Use the I<-i> option to automatically mount the disks from a virtual "
+"machine:"
 msgstr ""
 
 #. type: verbatim
@@ -19294,8 +19300,8 @@ msgstr "B<--listen>"
 #. type: textblock
 #: ../fish/guestfish.pod:296
 msgid ""
-"Fork into the background and listen for remote commands.  See section L</"
-"REMOTE CONTROL GUESTFISH OVER A SOCKET> below."
+"Fork into the background and listen for remote commands.  See section "
+"L</REMOTE CONTROL GUESTFISH OVER A SOCKET> below."
 msgstr ""
 
 #. type: =item
@@ -19306,8 +19312,8 @@ msgstr "B<--live>"
 #. type: textblock
 #: ../fish/guestfish.pod:301 ../fuse/guestmount.pod:179
 msgid ""
-"Connect to a live virtual machine.  (Experimental, see L<guestfs(3)/"
-"ATTACHING TO RUNNING DAEMONS>)."
+"Connect to a live virtual machine.  (Experimental, see "
+"L<guestfs(3)/ATTACHING TO RUNNING DAEMONS>)."
 msgstr ""
 
 #. type: =item
@@ -19345,21 +19351,21 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:317
 msgid ""
-"If you don't know what filesystems a disk image contains, you can either run "
-"guestfish without this option, then list the partitions, filesystems and LVs "
-"available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
+"If you don't know what filesystems a disk image contains, you can either run"
+" guestfish without this option, then list the partitions, filesystems and "
+"LVs available (see L</list-partitions>, L</list-filesystems> and L</lvs> "
 "commands), or you can use the L<virt-filesystems(1)> program."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:323 ../fuse/guestmount.pod:192
 msgid ""
-"The third (and rarely used) part of the mount parameter is the list of mount "
-"options used to mount the underlying filesystem.  If this is not given, then "
-"the mount options are either the empty string or C<ro> (the latter if the "
-"I<--ro> flag is used).  By specifying the mount options, you override this "
-"default choice.  Probably the only time you would use this is to enable ACLs "
-"and/or extended attributes if the filesystem can support them:"
+"The third (and rarely used) part of the mount parameter is the list of mount"
+" options used to mount the underlying filesystem.  If this is not given, "
+"then the mount options are either the empty string or C<ro> (the latter if "
+"the I<--ro> flag is used).  By specifying the mount options, you override "
+"this default choice.  Probably the only time you would use this is to enable"
+" ACLs and/or extended attributes if the filesystem can support them:"
 msgstr ""
 
 #. type: verbatim
@@ -19411,8 +19417,8 @@ msgstr "B<-N help>"
 #. type: textblock
 #: ../fish/guestfish.pod:348
 msgid ""
-"Prepare a fresh disk image formatted as \"type\".  This is an alternative to "
-"the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
+"Prepare a fresh disk image formatted as \"type\".  This is an alternative to"
+" the I<-a> option: whereas I<-a> adds an existing disk, I<-N> creates a "
 "preformatted disk with a filesystem and adds it.  See L</PREPARED DISK "
 "IMAGES> below."
 msgstr ""
@@ -19478,8 +19484,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:376 ../rescue/virt-rescue.pod:167
 msgid ""
-"The option must always be used if the disk image or virtual machine might be "
-"running, and is generally recommended in cases where you don't need write "
+"The option must always be used if the disk image or virtual machine might be"
+" running, and is generally recommended in cases where you don't need write "
 "access to the disk."
 msgstr ""
 
@@ -19510,7 +19516,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:394
 msgid ""
-"Enable very verbose messages.  This is particularly useful if you find a bug."
+"Enable very verbose messages.  This is particularly useful if you find a "
+"bug."
 msgstr ""
 
 #. type: textblock
@@ -19584,9 +19591,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:432
 msgid ""
-"In either command line mode or non-interactive shell, the first command that "
-"gives an error causes the whole shell to exit.  In interactive mode (with a "
-"prompt) if a command fails, you can continue to enter commands."
+"In either command line mode or non-interactive shell, the first command that"
+" gives an error causes the whole shell to exit.  In interactive mode (with a"
+" prompt) if a command fails, you can continue to enter commands."
 msgstr ""
 
 #. type: =head1
@@ -19598,8 +19605,8 @@ msgstr ""
 #: ../fish/guestfish.pod:439
 msgid ""
 "As with L<guestfs(3)>, you must first configure your guest by adding disks, "
-"then launch it, then mount any disks you need, and finally issue actions/"
-"commands.  So the general order of the day is:"
+"then launch it, then mount any disks you need, and finally issue "
+"actions/commands.  So the general order of the day is:"
 msgstr ""
 
 #. type: textblock
@@ -19653,9 +19660,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:478
 msgid ""
-"In libguestfs E<le> 1.10, guestfish, guestmount and virt-rescue defaulted to "
-"opening disk images supplied on the command line for write.  To open a disk "
-"image read-only you have to do I<-a image --ro>."
+"In libguestfs E<le> 1.10, guestfish, guestmount and virt-rescue defaulted to"
+" opening disk images supplied on the command line for write.  To open a disk"
+" image read-only you have to do I<-a image --ro>."
 msgstr ""
 
 #. type: textblock
@@ -19680,16 +19687,16 @@ msgstr ""
 msgid ""
 "This version of guestfish, guestmount and virt-rescue has a I<--rw> option "
 "which does nothing (it is already the default).  However it is highly "
-"recommended that you use this option to indicate that you need write access, "
-"and prepare your scripts for the day when this option will be required for "
+"recommended that you use this option to indicate that you need write access,"
+" and prepare your scripts for the day when this option will be required for "
 "write access."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:498
 msgid ""
-"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any "
-"other libguestfs program apart from guestfish and guestmount."
+"B<Note:> This does I<not> affect commands like L</add> and L</mount>, or any"
+" other libguestfs program apart from guestfish and guestmount."
 msgstr ""
 
 #. type: =head1
@@ -19700,8 +19707,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:503
 msgid ""
-"You can quote ordinary parameters using either single or double quotes.  For "
-"example:"
+"You can quote ordinary parameters using either single or double quotes.  For"
+" example:"
 msgstr ""
 
 #. type: verbatim
@@ -19755,7 +19762,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:523
 msgid ""
-"In double-quoted arguments (only) use backslash to insert special characters:"
+"In double-quoted arguments (only) use backslash to insert special "
+"characters:"
 msgstr ""
 
 #. type: =item
@@ -19846,8 +19854,8 @@ msgstr "C<\\ooo>"
 #. type: textblock
 #: ../fish/guestfish.pod:562
 msgid ""
-"A character with octal value I<ooo>.  There must be precisely 3 octal digits "
-"(unlike C)."
+"A character with octal value I<ooo>.  There must be precisely 3 octal digits"
+" (unlike C)."
 msgstr ""
 
 #. type: =item
@@ -19917,8 +19925,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:591
 msgid ""
-"Each optional argument can appear at most once.  All optional arguments must "
-"appear after the required ones."
+"Each optional argument can appear at most once.  All optional arguments must"
+" appear after the required ones."
 msgstr ""
 
 #. type: =head1
@@ -19940,8 +19948,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:601
 msgid ""
-"When the command takes a parameter measured in bytes, you can use one of the "
-"following suffixes to specify kilobytes, megabytes and larger sizes:"
+"When the command takes a parameter measured in bytes, you can use one of the"
+" following suffixes to specify kilobytes, megabytes and larger sizes:"
 msgstr ""
 
 #. type: =item
@@ -20180,8 +20188,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:705
 msgid ""
-"Neither guestfish nor the underlying guestfs API performs wildcard expansion "
-"(globbing) by default.  So for example the following will not do what you "
+"Neither guestfish nor the underlying guestfs API performs wildcard expansion"
+" (globbing) by default.  So for example the following will not do what you "
 "expect:"
 msgstr ""
 
@@ -20216,8 +20224,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:718
 msgid ""
-"runs C<rm-rf> on each path that matches (ie. potentially running the command "
-"many times), equivalent to:"
+"runs C<rm-rf> on each path that matches (ie. potentially running the command"
+" many times), equivalent to:"
 msgstr ""
 
 #. type: verbatim
@@ -20330,8 +20338,8 @@ msgstr ""
 #: ../fish/guestfish.pod:767
 msgid ""
 "For example it is tedious to create a sequence of files (eg. C</foo.1> "
-"through C</foo.100>) using guestfish commands alone.  However this is simple "
-"if we use a shell script to create the guestfish commands for us:"
+"through C</foo.100>) using guestfish commands alone.  However this is simple"
+" if we use a shell script to create the guestfish commands for us:"
 msgstr ""
 
 #. type: verbatim
@@ -20374,8 +20382,8 @@ msgstr "КАНАЛИ"
 #: ../fish/guestfish.pod:786
 msgid ""
 "Use C<command E<lt>spaceE<gt> | command> to pipe the output of the first "
-"command (a guestfish command) to the second command (any host command).  For "
-"example:"
+"command (a guestfish command) to the second command (any host command).  For"
+" example:"
 msgstr ""
 
 #. type: verbatim
@@ -20390,8 +20398,8 @@ msgstr ""
 #: ../fish/guestfish.pod:792
 msgid ""
 "(where C<cat> is the guestfish cat command, but C<awk> is the host awk "
-"program).  The above command would list all accounts in the guest filesystem "
-"which have UID 0, ie. root accounts including backdoors.  Other examples:"
+"program).  The above command would list all accounts in the guest filesystem"
+" which have UID 0, ie. root accounts including backdoors.  Other examples:"
 msgstr ""
 
 #. type: verbatim
@@ -20416,8 +20424,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:806
 msgid ""
-"To use a literal argument which begins with a pipe symbol, you have to quote "
-"it, eg:"
+"To use a literal argument which begins with a pipe symbol, you have to quote"
+" it, eg:"
 msgstr ""
 
 #. type: verbatim
@@ -20436,9 +20444,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:813
 msgid ""
-"If a parameter starts with the character C<~> then the tilde may be expanded "
-"as a home directory path (either C<~> for the current user's home directory, "
-"or C<~user> for another user)."
+"If a parameter starts with the character C<~> then the tilde may be expanded"
+" as a home directory path (either C<~> for the current user's home "
+"directory, or C<~user> for another user)."
 msgstr ""
 
 #. type: textblock
@@ -20532,8 +20540,8 @@ msgstr ""
 #: ../fish/guestfish.pod:851
 msgid ""
 "Before closing a LUKS device you must unmount any logical volumes on it and "
-"deactivate the volume groups by calling C<vg-activate false VG> on each "
-"one.  Then you can close the mapper device:"
+"deactivate the volume groups by calling C<vg-activate false VG> on each one."
+"  Then you can close the mapper device:"
 msgstr ""
 
 #. type: verbatim
@@ -20582,9 +20590,9 @@ msgstr ""
 msgid ""
 "The parameter is rewritten \"behind the scenes\" by looking up the position "
 "where the drive is mounted, prepending that to the path, changing all "
-"backslash characters to forward slash, then resolving the result using L</"
-"case-sensitive-path>.  For example if the E: drive was mounted on C</e> then "
-"the parameter might be rewritten like this:"
+"backslash characters to forward slash, then resolving the result using L"
+"</case-sensitive-path>.  For example if the E: drive was mounted on C</e> "
+"then the parameter might be rewritten like this:"
 msgstr ""
 
 #. type: verbatim
@@ -20665,9 +20673,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:906
 msgid ""
-"Any string of characters can be used instead of C<END>.  The end marker must "
-"appear on a line of its own, without any preceeding or following characters "
-"(not even spaces)."
+"Any string of characters can be used instead of C<END>.  The end marker must"
+" appear on a line of its own, without any preceeding or following characters"
+" (not even spaces)."
 msgstr ""
 
 #. type: textblock
@@ -20758,8 +20766,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:949
 msgid ""
-"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which "
-"is how the I<--remote> option knows where to send the commands.  You can "
+"The C<eval> statement sets the environment variable C<$GUESTFISH_PID>, which"
+" is how the I<--remote> option knows where to send the commands.  You can "
 "have several guestfish listener processes running using:"
 msgstr ""
 
@@ -20805,9 +20813,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:970
 msgid ""
-"Remote control happens over a Unix domain socket called C</tmp/.guestfish-"
-"$UID/socket-$PID>, where C<$UID> is the effective user ID of the process, "
-"and C<$PID> is the process ID of the server."
+"Remote control happens over a Unix domain socket called "
+"C</tmp/.guestfish-$UID/socket-$PID>, where C<$UID> is the effective user ID "
+"of the process, and C<$PID> is the process ID of the server."
 msgstr ""
 
 #. type: textblock
@@ -20913,8 +20921,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1016
 msgid ""
 "Since the C<run> command produces no output on stdout, this is not useful "
-"anyway.  For further information see L<https://bugzilla.redhat.com/show_bug."
-"cgi?id=592910>."
+"anyway.  For further information see "
+"L<https://bugzilla.redhat.com/show_bug.cgi?id=592910>."
 msgstr ""
 
 #. type: =head1
@@ -20946,10 +20954,10 @@ msgid ""
 "The type briefly describes how the disk should be sized, partitioned, how "
 "filesystem(s) should be created, and how content should be added.  "
 "Optionally the type can be followed by extra parameters, separated by C<:> "
-"(colon) characters.  For example, I<-N fs> creates a default 100MB, sparsely-"
-"allocated disk, containing a single partition, with the partition formatted "
-"as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem on a 1GB "
-"disk instead."
+"(colon) characters.  For example, I<-N fs> creates a default 100MB, "
+"sparsely-allocated disk, containing a single partition, with the partition "
+"formatted as ext2.  I<-N fs:ext4:1G> is the same, but for an ext4 filesystem"
+" on a 1GB disk instead."
 msgstr ""
 
 #. type: textblock
@@ -20960,8 +20968,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1044
 msgid ""
-"Note that the prepared filesystem is not mounted.  You would usually have to "
-"use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
+"Note that the prepared filesystem is not mounted.  You would usually have to"
+" use the C<mount /dev/sda1 /> command or add the I<-m /dev/sda1> option."
 msgstr ""
 
 #. type: textblock
@@ -21026,8 +21034,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1071
 msgid ""
 "When a command that supports progress bars takes longer than two seconds to "
-"run, and if progress bars are enabled, then you will see one appearing below "
-"the command:"
+"run, and if progress bars are enabled, then you will see one appearing below"
+" the command:"
 msgstr ""
 
 #. type: verbatim
@@ -21054,8 +21062,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1085
 msgid ""
 "Progress bars are enabled by default when guestfish is used interactively.  "
-"You can enable them even for non-interactive modes using I<--progress-bars>, "
-"and you can disable them completely using I<--no-progress-bars>."
+"You can enable them even for non-interactive modes using I<--progress-bars>,"
+" and you can disable them completely using I<--no-progress-bars>."
 msgstr ""
 
 #. type: =head1
@@ -21154,8 +21162,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1132 ../src/guestfs.pod:3217
 msgid ""
-"These two environment variables allow the kernel that libguestfs uses in the "
-"appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not set, then the "
+"These two environment variables allow the kernel that libguestfs uses in the"
+" appliance to be selected.  If C<$FEBOOTSTRAP_KERNEL> is not set, then the "
 "most recent host kernel is chosen.  For more information about kernel "
 "selection, see L<febootstrap-supermin-helper(8)>.  This feature is only "
 "available in febootstrap E<ge> 3.8."
@@ -21272,8 +21280,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1183 ../src/guestfs.pod:3246
 msgid ""
-"Set the default qemu binary that libguestfs uses.  If not set, then the qemu "
-"which was found at compile time by the configure script is used."
+"Set the default qemu binary that libguestfs uses.  If not set, then the qemu"
+" which was found at compile time by the configure script is used."
 msgstr ""
 
 #. type: =item
@@ -21377,8 +21385,8 @@ msgstr ""
 #: ../fish/guestfish.pod:1231
 msgid ""
 "If compiled with GNU readline support, then these files can be used to "
-"configure readline.  For further information, please see L<readline(3)/"
-"INITIALIZATION FILE>."
+"configure readline.  For further information, please see "
+"L<readline(3)/INITIALIZATION FILE>."
 msgstr ""
 
 #. type: textblock
@@ -21399,8 +21407,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/guestfish.pod:1241
 msgid ""
-"Variables that you can set in inputrc that change the behaviour of guestfish "
-"in useful ways include:"
+"Variables that you can set in inputrc that change the behaviour of guestfish"
+" in useful ways include:"
 msgstr ""
 
 #. type: =item
@@ -21443,20 +21451,21 @@ msgstr ""
 msgid ""
 "When using the I<-N> or I<--new> option, the prepared disk or filesystem "
 "will be created in the file C<test1.img> in the current directory.  The "
-"second use of I<-N> will use C<test2.img> and so on.  Any existing file with "
-"the same name will be overwritten."
+"second use of I<-N> will use C<test2.img> and so on.  Any existing file with"
+" the same name will be overwritten."
 msgstr ""
 
 #. type: textblock
 #: ../fish/guestfish.pod:1270
 msgid ""
 "L<guestfs(3)>, L<http://libguestfs.org/>, L<virt-alignment-scan(1)>, L<virt-"
-"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit"
-"(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-filesystems"
-"(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-"
-"rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-sysprep(1)>, "
-"L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, "
-"L<display(1)>, L<hexedit(1)>, L<febootstrap-supermin-helper(8)>."
+"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-"
+"edit(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-"
+"filesystems(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-"
+"fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-"
+"sysprep(1)>, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-"
+"win-reg(1)>, L<display(1)>, L<hexedit(1)>, L<febootstrap-supermin-"
+"helper(8)>."
 msgstr ""
 
 #. type: textblock
@@ -21490,8 +21499,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:15
 msgid ""
-"Using C<virt-copy-in> on live virtual machines can be dangerous, potentially "
-"causing disk corruption.  The virtual machine must be shut down before you "
+"Using C<virt-copy-in> on live virtual machines can be dangerous, potentially"
+" causing disk corruption.  The virtual machine must be shut down before you "
 "use this command."
 msgstr ""
 
@@ -21541,9 +21550,9 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:41
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<copy-in> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<copy-in> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
@@ -21557,8 +21566,8 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-in.pod:52
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, "
-"L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-out(1)>, L<virt-edit(1)>, L"
+"<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21621,16 +21630,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-copy-out.pod:30
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<copy-out> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<copy-out> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-copy-out.pod:41
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-edit(1)>, L<virt-"
-"tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-edit(1)>, L"
+"<virt-tar-in(1)>, L<virt-tar-out(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21696,17 +21705,17 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-tar-in.pod:38
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<tar-in> command.  For anything more complex than a trivial copy, you are "
-"probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<tar-in> command.  For anything more complex than a trivial"
+" copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-tar-in.pod:49
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
-"L<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, L<http://libguestfs."
-"org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L"
+"<virt-edit(1)>, L<virt-make-fs(1)>, L<virt-tar-out(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21769,16 +21778,16 @@ msgstr ""
 #. type: textblock
 #: ../fish/virt-tar-out.pod:32
 msgid ""
-"This command is just a simple shell script wrapper around the L<guestfish(1)"
-"> C<tar-out> command.  For anything more complex than a trivial copy, you "
-"are probably better off using guestfish directly."
+"This command is just a simple shell script wrapper around the "
+"L<guestfish(1)> C<tar-out> command.  For anything more complex than a "
+"trivial copy, you are probably better off using guestfish directly."
 msgstr ""
 
 #. type: textblock
 #: ../fish/virt-tar-out.pod:43
 msgid ""
-"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
-"L<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L"
+"<virt-edit(1)>, L<virt-tar-in(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -21831,8 +21840,8 @@ msgstr ""
 #: ../fuse/guestmount.pod:27
 msgid ""
 "Along with other options, you have to give at least one device (I<-a> "
-"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m> "
-"option) or use the I<-i> inspection option or the I<--live> option.  How "
+"option) or libvirt domain (I<-d> option), and at least one mountpoint (I<-m>"
+" option) or use the I<-i> inspection option or the I<--live> option.  How "
 "this works is better explained in the L<guestfish(1)> manual page, or by "
 "looking at the examples below."
 msgstr ""
@@ -21841,9 +21850,9 @@ msgstr ""
 #: ../fuse/guestmount.pod:33
 msgid ""
 "FUSE lets you mount filesystems as non-root.  The mountpoint must be owned "
-"by you, and the filesystem will not be visible to any other users unless you "
-"make certain global configuration changes to C</etc/fuse.conf>.  To unmount "
-"the filesystem, use the C<fusermount -u> command."
+"by you, and the filesystem will not be visible to any other users unless you"
+" make certain global configuration changes to C</etc/fuse.conf>.  To unmount"
+" the filesystem, use the C<fusermount -u> command."
 msgstr ""
 
 #. type: textblock
@@ -22005,11 +22014,11 @@ msgstr "B<--dir-cache-timeout N>"
 #. type: textblock
 #: ../fuse/guestmount.pod:125
 msgid ""
-"Set the readdir cache timeout to I<N> seconds, the default being 60 "
-"seconds.  The readdir cache [actually, there are several semi-independent "
-"caches] is populated after a readdir(2) call with the stat and extended "
-"attributes of the files in the directory, in anticipation that they will be "
-"requested soon after."
+"Set the readdir cache timeout to I<N> seconds, the default being 60 seconds."
+"  The readdir cache [actually, there are several semi-independent caches] is"
+" populated after a readdir(2) call with the stat and extended attributes of "
+"the files in the directory, in anticipation that they will be requested soon"
+" after."
 msgstr ""
 
 #. type: textblock
@@ -22025,8 +22034,8 @@ msgstr ""
 msgid ""
 "If you have untrusted raw-format guest disk images, you should use this "
 "option to specify the disk format.  This avoids a possible security problem "
-"with malicious guests (CVE-2010-3851).  See also L<guestfs(3)/"
-"guestfs_add_drive_opts>."
+"with malicious guests (CVE-2010-3851).  See also "
+"L<guestfs(3)/guestfs_add_drive_opts>."
 msgstr ""
 
 #. type: =item
@@ -22047,8 +22056,8 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:186
 msgid ""
-"Mount the named partition or logical volume on the given mountpoint B<in the "
-"guest> (this has nothing to do with mountpoints in the host)."
+"Mount the named partition or logical volume on the given mountpoint B<in the"
+" guest> (this has nothing to do with mountpoints in the host)."
 msgstr ""
 
 #. type: textblock
@@ -22130,8 +22139,8 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:237
 msgid ""
-"Allow the kernel to cache files (reduces the number of reads that have to go "
-"through the L<guestfs(3)> API).  This is generally a good idea if you can "
+"Allow the kernel to cache files (reduces the number of reads that have to go"
+" through the L<guestfs(3)> API).  This is generally a good idea if you can "
 "afford the extra memory usage."
 msgstr ""
 
@@ -22207,13 +22216,13 @@ msgstr ""
 #. type: textblock
 #: ../fuse/guestmount.pod:319
 msgid ""
-"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
-"L<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, L<http://fuse.sf."
-"net/>."
+"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L"
+"<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, "
+"L<http://fuse.sf.net/>."
 msgstr ""
-"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
-"L<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, L<http://fuse.sf."
-"net/>."
+"L<guestfish(1)>, L<virt-inspector(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L"
+"<virt-tar(1)>, L<guestfs(3)>, L<http://libguestfs.org/>, "
+"L<http://fuse.sf.net/>."
 
 #. type: textblock
 #: ../fuse/guestmount.pod:334
@@ -22283,10 +22292,10 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:30
 msgid ""
 "You can also run virt-inspector directly on disk images from a single "
-"virtual machine.  Use C<virt-inspector -a disk.img>.  In rare cases a domain "
-"has several block devices, in which case you should list several I<-a> "
-"options one after another, with the first corresponding to the guest's C</"
-"dev/sda>, the second to the guest's C</dev/sdb> and so on."
+"virtual machine.  Use C<virt-inspector -a disk.img>.  In rare cases a domain"
+" has several block devices, in which case you should list several I<-a> "
+"options one after another, with the first corresponding to the guest's "
+"C</dev/sda>, the second to the guest's C</dev/sdb> and so on."
 msgstr ""
 
 #. type: textblock
@@ -22299,8 +22308,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:40
 msgid ""
-"Virt-inspector can only inspect and report upon I<one domain at a time>.  To "
-"inspect several virtual machines, you have to run virt-inspector several "
+"Virt-inspector can only inspect and report upon I<one domain at a time>.  To"
+" inspect several virtual machines, you have to run virt-inspector several "
 "times (for example, from a shell script for-loop)."
 msgstr ""
 
@@ -22388,8 +22397,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:155
 msgid ""
-"The virt-inspector XML is described precisely in a RELAX NG schema file "
-"C<virt-inspector.rng> which is supplied with libguestfs.  This section is "
+"The virt-inspector XML is described precisely in a RELAX NG schema file C"
+"<virt-inspector.rng> which is supplied with libguestfs.  This section is "
 "just an overview."
 msgstr ""
 
@@ -22438,8 +22447,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:183
 msgid ""
 "In brief, E<lt>nameE<gt> is the class of operating system (something like "
-"C<linux> or C<windows>), E<lt>distroE<gt> is the distribution (eg. C<fedora> "
-"but many other distros are recognized) and E<lt>archE<gt> is the guest "
+"C<linux> or C<windows>), E<lt>distroE<gt> is the distribution (eg. C<fedora>"
+" but many other distros are recognized) and E<lt>archE<gt> is the guest "
 "architecture.  The other fields are fairly self-explanatory, but because "
 "these fields are taken directly from the libguestfs inspection API you can "
 "find precise information from L<guestfs(3)/INSPECTION>."
@@ -22448,8 +22457,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:191
 msgid ""
-"The E<lt>rootE<gt> element is the root filesystem device, but from the point "
-"of view of libguestfs (block devices may have completely different names "
+"The E<lt>rootE<gt> element is the root filesystem device, but from the point"
+" of view of libguestfs (block devices may have completely different names "
 "inside the VM itself)."
 msgstr ""
 
@@ -22582,8 +22591,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:262
 msgid ""
 "The version and release fields may not be available for some types guests.  "
-"Other fields are possible, see L<guestfs(3)/"
-"guestfs_inspect_list_applications>."
+"Other fields are possible, see "
+"L<guestfs(3)/guestfs_inspect_list_applications>."
 msgstr ""
 
 #. type: =head2
@@ -22615,17 +22624,17 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:280
 msgid ""
-"In the example above, drive C maps to the filesystem on the second partition "
-"on the first disk, and drive E maps to the filesystem on the first partition "
-"on the second disk."
+"In the example above, drive C maps to the filesystem on the second partition"
+" on the first disk, and drive E maps to the filesystem on the first "
+"partition on the second disk."
 msgstr ""
 
 #. type: textblock
 #: ../inspector/virt-inspector.pod:284
 msgid ""
 "Note that this only covers permanent local filesystem mappings, not things "
-"like network shares.  Furthermore NTFS volume mount points may not be listed "
-"here."
+"like network shares.  Furthermore NTFS volume mount points may not be listed"
+" here."
 msgstr ""
 
 #. type: =head2
@@ -22658,8 +22667,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:302
 msgid ""
-"To display the icon, you have to extract it and convert the base64 data back "
-"to a binary file.  Use an XPath query or simply an editor to extract the "
+"To display the icon, you have to extract it and convert the base64 data back"
+" to a binary file.  Use an XPath query or simply an editor to extract the "
 "data, then use the coreutils L<base64(1)> program to do the conversion back "
 "to a PNG file:"
 msgstr ""
@@ -22680,8 +22689,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:311
 msgid ""
-"Virt-inspector can detect some operating system installers on install disks, "
-"live CDs, bootable USB keys and more."
+"Virt-inspector can detect some operating system installers on install disks,"
+" live CDs, bootable USB keys and more."
 msgstr ""
 
 #. type: textblock
@@ -22719,7 +22728,8 @@ msgstr ""
 #: ../inspector/virt-inspector.pod:332
 msgid ""
 "You can use the XPath query language to select parts of the XML.  We "
-"recommend using C<xmlstarlet> to perform XPath queries from the command line."
+"recommend using C<xmlstarlet> to perform XPath queries from the command "
+"line."
 msgstr ""
 
 #. type: verbatim
@@ -22762,8 +22772,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:361
 msgid ""
-"Early versions of libguestfs shipped with a different virt-inspector program "
-"written in Perl (the current version is written in C).  The XML output of "
+"Early versions of libguestfs shipped with a different virt-inspector program"
+" written in Perl (the current version is written in C).  The XML output of "
 "the Perl virt-inspector was different and it could also output in other "
 "formats like text."
 msgstr ""
@@ -22793,8 +22803,8 @@ msgstr ""
 #. type: textblock
 #: ../inspector/virt-inspector.pod:382
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<http://www.w3.org/TR/xpath/>, L<base64(1)"
-">, L<xmlstarlet(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<http://www.w3.org/TR/xpath/>, "
+"L<base64(1)>, L<xmlstarlet(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -22829,9 +22839,9 @@ msgstr ""
 #: ../java/examples/guestfs-java.pod:17
 msgid ""
 "This manual page documents how to call libguestfs from the Java programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -22843,8 +22853,8 @@ msgstr ""
 #: ../java/examples/guestfs-java.pod:24
 msgid ""
 "The handle is closed when it is reaped by the garbage collector.  Because "
-"libguestfs handles include a lot of state, it is also possible to close (and "
-"hence free) them explicitly by calling the C<close> method."
+"libguestfs handles include a lot of state, it is also possible to close (and"
+" hence free) them explicitly by calling the C<close> method."
 msgstr ""
 
 #. type: =head2
@@ -22870,8 +22880,8 @@ msgstr ""
 #. type: textblock
 #: ../java/examples/guestfs-java.pod:47
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-ocaml"
-"(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
 "L<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
 msgstr ""
 
@@ -22923,10 +22933,10 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:27
 msgid ""
-"This manual page documents how to call libguestfs from the OCaml programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"This manual page documents how to call libguestfs from the OCaml programming"
+" language.  This page just documents the differences from the C API and "
+"gives some examples.  If you are not familiar with using libguestfs, you "
+"also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -22937,8 +22947,9 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:34
 msgid ""
-"There are two different programming styles supported by the OCaml bindings.  "
-"You can use a module style, with each C function mapped to an OCaml function:"
+"There are two different programming styles supported by the OCaml bindings."
+"  You can use a module style, with each C function mapped to an OCaml "
+"function:"
 msgstr ""
 
 #. type: verbatim
@@ -22989,8 +23000,8 @@ msgstr ""
 #: ../ocaml/examples/guestfs-ocaml.pod:55
 msgid ""
 "The handle is closed when it is reaped by the garbage collector.  Because "
-"libguestfs handles include a lot of state, it is also possible to close (and "
-"hence free) them explicitly by calling C<Guestfs.close> or the C<#close> "
+"libguestfs handles include a lot of state, it is also possible to close (and"
+" hence free) them explicitly by calling C<Guestfs.close> or the C<#close> "
 "method."
 msgstr ""
 
@@ -23005,17 +23016,17 @@ msgstr ""
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:66
 msgid ""
-"Calling any function/method on a closed handle raises C<Guestfs."
-"Handle_closed>.  The single parameter is the name of the function that you "
-"called."
+"Calling any function/method on a closed handle raises "
+"C<Guestfs.Handle_closed>.  The single parameter is the name of the function "
+"that you called."
 msgstr ""
 
 #. type: textblock
 #: ../ocaml/examples/guestfs-ocaml.pod:80
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, "
-"L<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-recipes(1)>, L"
+"<guestfs-ruby(3)>, L<http://libguestfs.org/>, L<http://caml.inria.fr/>."
 msgstr ""
 
 #. type: textblock
@@ -23048,9 +23059,10 @@ msgstr ""
 #: ../perl/examples/guestfs-perl.pod:20
 msgid ""
 "This manual page documents how to call libguestfs from the Perl programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>.  To read the full Perl API, see L<Sys::Guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>.  To read the full Perl API, see "
+"L<Sys::Guestfs(3)>."
 msgstr ""
 
 #. type: =head2
@@ -23061,16 +23073,16 @@ msgstr "ПОМИЛКИ"
 #. type: textblock
 #: ../perl/examples/guestfs-perl.pod:28
 msgid ""
-"Errors from libguestfs functions turn into calls to C<croak> (see L<Carp(3)"
-">)."
+"Errors from libguestfs functions turn into calls to C<croak> (see "
+"L<Carp(3)>)."
 msgstr ""
 
 #. type: textblock
 #: ../perl/examples/guestfs-perl.pod:41
 msgid ""
-"L<Sys::Guestfs(3)>, L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang"
-"(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-python(3)>, "
-"L<guestfs-recipes(1)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<Sys::Guestfs(3)>, L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-"
+"erlang(3)>, L<guestfs-java(3)>, L<guestfs-ocaml(3)>, L<guestfs-python(3)>, L"
+"<guestfs-recipes(1)>, L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -23094,8 +23106,8 @@ msgstr ""
 msgid ""
 "This manual page documents how to call libguestfs from the Python "
 "programming language.  This page just documents the differences from the C "
-"API and gives some examples.  If you are not familiar with using libguestfs, "
-"you also need to read L<guestfs(3)>."
+"API and gives some examples.  If you are not familiar with using libguestfs,"
+" you also need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: textblock
@@ -23128,9 +23140,9 @@ msgstr ""
 #. type: textblock
 #: ../python/examples/guestfs-python.pod:44
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-recipes(1)>, "
-"L<guestfs-ruby(3)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-recipes(1)>, L"
+"<guestfs-ruby(3)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -23198,8 +23210,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:36
 msgid ""
-"You can run virt-rescue on any virtual machine known to libvirt, or directly "
-"on disk image(s):"
+"You can run virt-rescue on any virtual machine known to libvirt, or directly"
+" on disk image(s):"
 msgstr ""
 
 #. type: verbatim
@@ -23235,10 +23247,10 @@ msgstr ""
 #: ../rescue/virt-rescue.pod:47
 msgid ""
 "When you run virt-rescue on a virtual machine or disk image, you are placed "
-"in an interactive bash shell where you can use many ordinary Linux "
-"commands.  What you see in C</> (C</bin>, C</lib> etc) is the rescue "
-"appliance.  You must mount the virtual machine's filesystems by hand.  There "
-"is an empty directory called C</sysroot> where you can mount filesystems."
+"in an interactive bash shell where you can use many ordinary Linux commands."
+"  What you see in C</> (C</bin>, C</lib> etc) is the rescue appliance.  You "
+"must mount the virtual machine's filesystems by hand.  There is an empty "
+"directory called C</sysroot> where you can mount filesystems."
 msgstr ""
 
 #. type: textblock
@@ -23264,8 +23276,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:64
 msgid ""
-"If you don't know what filesystems are available on the virtual machine then "
-"you can use commands such as L<parted(8)> and L<lvs(8)> to find out."
+"If you don't know what filesystems are available on the virtual machine then"
+" you can use commands such as L<parted(8)> and L<lvs(8)> to find out."
 msgstr ""
 
 #. type: textblock
@@ -23357,8 +23369,8 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:175
 msgid ""
-"Enable SELinux in the rescue appliance.  You should read L<guestfs(3)/"
-"SELINUX> before using this option."
+"Enable SELinux in the rescue appliance.  You should read "
+"L<guestfs(3)/SELINUX> before using this option."
 msgstr ""
 
 #. type: =item
@@ -23448,8 +23460,8 @@ msgstr ""
 msgid ""
 "The virt-rescue appliance needs to be small and so does not include many "
 "network tools.  In particular there is no L<telnet(1)> command.  You can "
-"make TCP connections from the shell using the magical C</dev/tcp/"
-"E<lt>hostnameE<gt>/E<lt>portE<gt>> syntax:"
+"make TCP connections from the shell using the magical "
+"C</dev/tcp/E<lt>hostnameE<gt>/E<lt>portE<gt>> syntax:"
 msgstr ""
 
 #. type: verbatim
@@ -23470,15 +23482,15 @@ msgstr ""
 #. type: textblock
 #: ../rescue/virt-rescue.pod:263
 msgid ""
-"Several environment variables affect virt-rescue.  See L<guestfs(3)/"
-"ENVIRONMENT VARIABLES> for the complete list."
+"Several environment variables affect virt-rescue.  See "
+"L<guestfs(3)/ENVIRONMENT VARIABLES> for the complete list."
 msgstr ""
 
 #. type: textblock
 #: ../rescue/virt-rescue.pod:290
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<http://"
-"libguestfs.org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -23500,8 +23512,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:15
 msgid ""
 "Virt-resize is a tool which can resize a virtual machine disk, making it "
-"larger or smaller overall, and resizing or deleting any partitions contained "
-"within."
+"larger or smaller overall, and resizing or deleting any partitions contained"
+" within."
 msgstr ""
 
 #. type: textblock
@@ -23672,7 +23684,8 @@ msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:92
-msgid "Use L<virt-filesystems(1)> to display the current partitions and sizes:"
+msgid ""
+"Use L<virt-filesystems(1)> to display the current partitions and sizes:"
 msgstr ""
 
 #. type: verbatim
@@ -23829,11 +23842,12 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:157
 msgid ""
-"If the expanded partition in the image contains a filesystem or LVM PV, then "
-"if virt-resize knows how, it will resize the contents, the equivalent of "
+"If the expanded partition in the image contains a filesystem or LVM PV, then"
+" if virt-resize knows how, it will resize the contents, the equivalent of "
 "calling a command such as L<pvresize(8)>, L<resize2fs(8)>, L<ntfsresize(8)> "
 "or L<btrfs(8)>.  However virt-resize does not know how to resize some "
-"filesystems, so you would have to online resize them after booting the guest."
+"filesystems, so you would have to online resize them after booting the "
+"guest."
 msgstr ""
 
 #. type: textblock
@@ -23867,8 +23881,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:174
 msgid ""
-"Change E<lt>source ...E<gt>, see L<http://libvirt.org/formatdomain."
-"html#elementsDisks>"
+"Change E<lt>source ...E<gt>, see "
+"L<http://libvirt.org/formatdomain.html#elementsDisks>"
 msgstr ""
 
 #. type: textblock
@@ -23905,8 +23919,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:188
 msgid ""
 "Once the guest has booted you should see the new space available, at least "
-"for filesystems that virt-resize knows how to resize, and for PVs.  The user "
-"may need to resize LVs inside PVs, and also resize filesystem types that "
+"for filesystems that virt-resize knows how to resize, and for PVs.  The user"
+" may need to resize LVs inside PVs, and also resize filesystem types that "
 "virt-resize does not know how to expand."
 msgstr ""
 
@@ -23958,8 +23972,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:215
 msgid ""
 "virt-resize also gives a convenient way to ignore or delete partitions when "
-"copying from the input disk to the output disk.  Ignoring a partition speeds "
-"up the copy where you don't care about the existing contents of a "
+"copying from the input disk to the output disk.  Ignoring a partition speeds"
+" up the copy where you don't care about the existing contents of a "
 "partition.  Deleting a partition removes it completely, but note that it "
 "also renumbers any partitions after the one which is deleted, which can "
 "leave some guests unbootable."
@@ -23973,10 +23987,10 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:224
 msgid ""
-"If the input disk is in qcow2 format, then you may prefer that the output is "
-"in qcow2 format as well.  Alternately, virt-resize can convert the format on "
-"the fly.  The output format is simply determined by the format of the empty "
-"output container that you provide.  Thus to create qcow2 output, use:"
+"If the input disk is in qcow2 format, then you may prefer that the output is"
+" in qcow2 format as well.  Alternately, virt-resize can convert the format "
+"on the fly.  The output format is simply determined by the format of the "
+"empty output container that you provide.  Thus to create qcow2 output, use:"
 msgstr ""
 
 #. type: verbatim
@@ -24008,16 +24022,14 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:238
 msgid ""
-"(on older systems that don't have the L<fallocate(1)> command use C<dd if=/"
-"dev/zero of=outdisk bs=1M count=..>)"
+"(on older systems that don't have the L<fallocate(1)> command use C<dd "
+"if=/dev/zero of=outdisk bs=1M count=..>)"
 msgstr ""
 
 #. type: =head2
 #: ../resize/virt-resize.pod:241
-#, fuzzy
-#| msgid "PARTITIONING"
 msgid "LOGICAL PARTITIONS"
-msgstr "ПОДІЛ НА РОЗДІЛИ"
+msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:243
@@ -24029,10 +24041,10 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:246
 msgid ""
-"To understand what is going on, firstly one of the four partitions C</dev/"
-"sda1-4> will have MBR partition type C<05> or C<0f>.  This is called the "
-"B<extended partition>.  Use L<virt-filesystems(1)> to see the MBR partition "
-"type."
+"To understand what is going on, firstly one of the four partitions "
+"C</dev/sda1-4> will have MBR partition type C<05> or C<0f>.  This is called "
+"the B<extended partition>.  Use L<virt-filesystems(1)> to see the MBR "
+"partition type."
 msgstr ""
 
 #. type: textblock
@@ -24043,18 +24055,18 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:253
 msgid ""
-"The extended partition can be expanded, but not shrunk (unless you force it, "
-"which is not advisable).  When the extended partition is copied across, all "
-"the logical partitions contained inside are copied over implicitly.  Virt-"
-"resize does not look inside the extended partition, so it copies the logical "
-"partitions blindly."
+"The extended partition can be expanded, but not shrunk (unless you force it,"
+" which is not advisable).  When the extended partition is copied across, all"
+" the logical partitions contained inside are copied over implicitly.  Virt-"
+"resize does not look inside the extended partition, so it copies the logical"
+" partitions blindly."
 msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:259
 msgid ""
-"You cannot specify a logical partition (C</dev/sda5+>) at all on the command "
-"line.  Doing so will give an error."
+"You cannot specify a logical partition (C</dev/sda5+>) at all on the command"
+" line.  Doing so will give an error."
 msgstr ""
 
 #. type: textblock
@@ -24064,17 +24076,13 @@ msgstr ""
 
 #. type: =item
 #: ../resize/virt-resize.pod:270
-#, fuzzy
-#| msgid "B<--ignore part>"
 msgid "B<--align-first auto>"
-msgstr "B<--ignore розділ>"
+msgstr ""
 
 #. type: =item
 #: ../resize/virt-resize.pod:272
-#, fuzzy
-#| msgid "B<--listen>"
 msgid "B<--align-first never>"
-msgstr "B<--listen>"
+msgstr ""
 
 #. type: =item
 #: ../resize/virt-resize.pod:274
@@ -24084,8 +24092,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:276
 msgid ""
-"Align the first partition for improved performance (see also the I<--"
-"alignment> option)."
+"Align the first partition for improved performance (see also the "
+"I<--alignment> option)."
 msgstr ""
 
 #. type: textblock
@@ -24100,8 +24108,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:284
 msgid ""
-"I<--align-first never> means we never move the first partition.  This is the "
-"safest option.  Try this if the guest does not boot after resizing."
+"I<--align-first never> means we never move the first partition.  This is the"
+" safest option.  Try this if the guest does not boot after resizing."
 msgstr ""
 
 #. type: textblock
@@ -24114,16 +24122,14 @@ msgstr ""
 
 #. type: =item
 #: ../resize/virt-resize.pod:292
-#, fuzzy
-#| msgid "B<--time-t>"
 msgid "B<--alignment N>"
-msgstr "B<--time-t>"
+msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:294
 msgid ""
-"Set the alignment of partitions to C<N> sectors.  The default in virt-resize "
-"E<lt> 1.13.19 was 64 sectors, and after that is 128 sectors."
+"Set the alignment of partitions to C<N> sectors.  The default in virt-resize"
+" E<lt> 1.13.19 was 64 sectors, and after that is 128 sectors."
 msgstr ""
 
 #. type: textblock
@@ -24141,9 +24147,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:305
 msgid ""
-"The partitions would be packed together as closely as possible, but would be "
-"completely unaligned.  In some cases this can cause very poor performance.  "
-"See L<virt-alignment-scan(1)> for further details."
+"The partitions would be packed together as closely as possible, but would be"
+" completely unaligned.  In some cases this can cause very poor performance."
+"  See L<virt-alignment-scan(1)> for further details."
 msgstr ""
 
 #. type: =item
@@ -24154,8 +24160,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:311
 msgid ""
-"This would be the minimum acceptable alignment for reasonable performance on "
-"modern hosts."
+"This would be the minimum acceptable alignment for reasonable performance on"
+" modern hosts."
 msgstr ""
 
 #. type: =item
@@ -24264,9 +24270,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:367
 msgid ""
-"The filesystem must have been shut down consistently last time it was used.  "
-"Additionally, L<ntfsresize(8)> marks the resized filesystem as requiring a "
-"consistency check, so at the first boot after resizing Windows will check "
+"The filesystem must have been shut down consistently last time it was used."
+"  Additionally, L<ntfsresize(8)> marks the resized filesystem as requiring a"
+" consistency check, so at the first boot after resizing Windows will check "
 "the disk."
 msgstr ""
 
@@ -24318,8 +24324,8 @@ msgstr "B<--ignore розділ>"
 #: ../resize/virt-resize.pod:399
 msgid ""
 "Ignore the named partition.  Effectively this means the partition is "
-"allocated on the destination disk, but the content is not copied across from "
-"the source disk.  The content of the partition will be blank (all zero "
+"allocated on the destination disk, but the content is not copied across from"
+" the source disk.  The content of the partition will be blank (all zero "
 "bytes)."
 msgstr ""
 
@@ -24333,8 +24339,8 @@ msgstr "B<--LV-expand логічний_том>"
 msgid ""
 "This takes the logical volume and, as a final step, expands it to fill all "
 "the space available in its volume group.  A typical usage, assuming a Linux "
-"guest with a single PV C</dev/sda2> and a root device called C</dev/vg_guest/"
-"lv_root> would be:"
+"guest with a single PV C</dev/sda2> and a root device called "
+"C</dev/vg_guest/lv_root> would be:"
 msgstr ""
 
 #. type: verbatim
@@ -24356,9 +24362,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:419
 msgid ""
-"The contents of the LV are also resized if virt-resize knows how to do "
-"that.  You can stop virt-resize from trying to expand the content by using "
-"the option I<--no-expand-content>."
+"The contents of the LV are also resized if virt-resize knows how to do that."
+"  You can stop virt-resize from trying to expand the content by using the "
+"option I<--no-expand-content>."
 msgstr ""
 
 #. type: textblock
@@ -24427,9 +24433,9 @@ msgstr "B<--no-extra-partition>"
 msgid ""
 "By default, virt-resize creates an extra partition if there is any extra, "
 "unused space after all resizing has happened.  Use this option to prevent "
-"the extra partition from being created.  If you do this then the extra space "
-"will be inaccessible until you run fdisk, parted, or some other partitioning "
-"tool in the guest."
+"the extra partition from being created.  If you do this then the extra space"
+" will be inaccessible until you run fdisk, parted, or some other "
+"partitioning tool in the guest."
 msgstr ""
 
 #. type: textblock
@@ -24480,8 +24486,8 @@ msgstr "B<--output-format> raw"
 #. type: textblock
 #: ../resize/virt-resize.pod:480
 msgid ""
-"Specify the format of the output disk image.  If this flag is not given then "
-"it is auto-detected from the image itself."
+"Specify the format of the output disk image.  If this flag is not given then"
+" it is auto-detected from the image itself."
 msgstr ""
 
 #. type: textblock
@@ -24514,8 +24520,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:502
 msgid ""
 "C<size> can be expressed as an absolute number followed by b/K/M/G to mean "
-"bytes, Kilobytes, Megabytes, or Gigabytes; or as a percentage of the current "
-"size; or as a relative number or percentage.  For example:"
+"bytes, Kilobytes, Megabytes, or Gigabytes; or as a percentage of the current"
+" size; or as a relative number or percentage.  For example:"
 msgstr ""
 
 #. type: verbatim
@@ -24601,8 +24607,8 @@ msgid ""
 "This is the same as I<--resize> except that it will let you decrease the "
 "size of any partition.  Generally this means you will lose any data which "
 "was at the end of the partition you shrink, but you may not care about that "
-"(eg. if shrinking an unused partition, or if you can easily recreate it such "
-"as a swap partition)."
+"(eg. if shrinking an unused partition, or if you can easily recreate it such"
+" as a swap partition)."
 msgstr ""
 
 #. type: textblock
@@ -24630,10 +24636,10 @@ msgstr ""
 msgid ""
 "The amount by which the overall disk must be shrunk (after carrying out all "
 "other operations requested by the user) is called the \"deficit\".  For "
-"example, a straight copy (assume no other operations)  from a 5GB disk image "
-"to a 4GB disk image results in a 1GB deficit.  In this case, virt-resize "
-"would give an error unless the user specified a partition to shrink and that "
-"partition had more than a gigabyte of free space."
+"example, a straight copy (assume no other operations)  from a 5GB disk image"
+" to a 4GB disk image results in a 1GB deficit.  In this case, virt-resize "
+"would give an error unless the user specified a partition to shrink and that"
+" partition had more than a gigabyte of free space."
 msgstr ""
 
 #. type: =head1
@@ -24644,9 +24650,9 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:571
 msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-resize from other programs, GUIs "
-"etc."
+"The I<--machine-readable> option can be used to make the output more machine"
+" friendly, which is useful when calling virt-resize from other programs, "
+"GUIs etc."
 msgstr ""
 
 #. type: textblock
@@ -24719,8 +24725,8 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:612
 msgid ""
-"The calling program should treat messages sent to stderr as error messages.  "
-"In addition, virt-resize exits with a non-zero status code if there was a "
+"The calling program should treat messages sent to stderr as error messages."
+"  In addition, virt-resize exits with a non-zero status code if there was a "
 "fatal error."
 msgstr ""
 
@@ -24739,12 +24745,12 @@ msgstr ""
 #. type: textblock
 #: ../resize/virt-resize.pod:625
 msgid ""
-"Virt-resize aligns partitions to multiples of 128 sectors (see the I<--"
-"alignment> parameter).  Usually this means the partitions will not be "
+"Virt-resize aligns partitions to multiples of 128 sectors (see the "
+"I<--alignment> parameter).  Usually this means the partitions will not be "
 "aligned to the ancient CHS geometry.  However CHS geometry is meaningless "
-"for disks manufactured since the early 1990s, and doubly so for virtual hard "
-"drives.  Alignment of partitions to cylinders is not required by any modern "
-"operating system."
+"for disks manufactured since the early 1990s, and doubly so for virtual hard"
+" drives.  Alignment of partitions to cylinders is not required by any modern"
+" operating system."
 msgstr ""
 
 #. type: =head2
@@ -24766,8 +24772,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:641
 msgid ""
 "Windows may initiate a lengthy \"chkdsk\" on first boot after a resize, if "
-"NTFS partitions have been expanded.  This is just a safety check and (unless "
-"it find errors) is nothing to worry about."
+"NTFS partitions have been expanded.  This is just a safety check and (unless"
+" it find errors) is nothing to worry about."
 msgstr ""
 
 #. type: =head2
@@ -24818,8 +24824,8 @@ msgstr ""
 #: ../resize/virt-resize.pod:665
 msgid ""
 "L<parted(8)> and its graphical shell gparted can do some types of resizing "
-"operations on disk images.  They can resize and move partitions, but I don't "
-"think they can do anything with the contents, and they certainly don't "
+"operations on disk images.  They can resize and move partitions, but I don't"
+" think they can do anything with the contents, and they certainly don't "
 "understand LVM."
 msgstr ""
 
@@ -24827,20 +24833,20 @@ msgstr ""
 #: ../resize/virt-resize.pod:670
 msgid ""
 "L<guestfish(1)> can do everything that virt-resize can do and a lot more, "
-"but at a much lower level.  You will probably end up hand-calculating sector "
-"offsets, which is something that virt-resize was designed to avoid.  If you "
-"want to see the guestfish-equivalent commands that virt-resize runs, use the "
-"I<--debug> flag."
+"but at a much lower level.  You will probably end up hand-calculating sector"
+" offsets, which is something that virt-resize was designed to avoid.  If you"
+" want to see the guestfish-equivalent commands that virt-resize runs, use "
+"the I<--debug> flag."
 msgstr ""
 
 #. type: textblock
 #: ../resize/virt-resize.pod:690
 msgid ""
-"L<virt-filesystems(1)>, L<virt-df(1)>, L<guestfs(3)>, L<guestfish(1)>, L<lvm"
-"(8)>, L<pvresize(8)>, L<lvresize(8)>, L<resize2fs(8)>, L<ntfsresize(8)>, "
-"L<btrfs(8)>, L<virsh(1)>, L<parted(8)>, L<truncate(1)>, L<fallocate(1)>, "
-"L<grub(8)>, L<grub-install(8)>, L<virt-rescue(1)>, L<virt-sparsify(1)>, "
-"L<virt-alignment-scan(1)>, L<http://libguestfs.org/>."
+"L<virt-filesystems(1)>, L<virt-df(1)>, L<guestfs(3)>, L<guestfish(1)>, "
+"L<lvm(8)>, L<pvresize(8)>, L<lvresize(8)>, L<resize2fs(8)>, "
+"L<ntfsresize(8)>, L<btrfs(8)>, L<virsh(1)>, L<parted(8)>, L<truncate(1)>, "
+"L<fallocate(1)>, L<grub(8)>, L<grub-install(8)>, L<virt-rescue(1)>, L<virt-"
+"sparsify(1)>, L<virt-alignment-scan(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -24864,9 +24870,9 @@ msgstr ""
 #: ../ruby/examples/guestfs-ruby.pod:17
 msgid ""
 "This manual page documents how to call libguestfs from the Ruby programming "
-"language.  This page just documents the differences from the C API and gives "
-"some examples.  If you are not familiar with using libguestfs, you also need "
-"to read L<guestfs(3)>."
+"language.  This page just documents the differences from the C API and gives"
+" some examples.  If you are not familiar with using libguestfs, you also "
+"need to read L<guestfs(3)>."
 msgstr ""
 
 #. type: textblock
@@ -24879,9 +24885,9 @@ msgstr ""
 #. type: textblock
 #: ../ruby/examples/guestfs-ruby.pod:38
 msgid ""
-"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java"
-"(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, "
-"L<guestfs-recipes(1)>, L<http://libguestfs.org/>."
+"L<guestfs(3)>, L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-"
+"java(3)>, L<guestfs-ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L"
+"<guestfs-recipes(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
@@ -24948,8 +24954,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:45
 msgid ""
-"Virt-sparsify may require up to 2x the virtual size of the source disk image "
-"(1 temporary copy + 1 destination image).  This is in the worst case and "
+"Virt-sparsify may require up to 2x the virtual size of the source disk image"
+" (1 temporary copy + 1 destination image).  This is in the worst case and "
 "usually much less space is required."
 msgstr ""
 
@@ -25005,7 +25011,8 @@ msgstr ""
 msgid ""
 "which copies C<indisk> to C<outdisk>, making the output sparse.  C<outdisk> "
 "is created, or overwritten if it already exists.  The format of the input "
-"disk is detected (eg. qcow2) and the same format is used for the output disk."
+"disk is detected (eg. qcow2) and the same format is used for the output "
+"disk."
 msgstr ""
 
 #. type: textblock
@@ -25025,8 +25032,8 @@ msgstr ""
 #: ../sparsify/virt-sparsify.pod:90
 msgid ""
 "Virt-sparsify tries to zero and sparsify free space on every filesystem it "
-"can find within the source disk image.  You can get it to ignore (don't zero "
-"free space on) certain filesystems by doing:"
+"can find within the source disk image.  You can get it to ignore (don't zero"
+" free space on) certain filesystems by doing:"
 msgstr ""
 
 #. type: verbatim
@@ -25080,8 +25087,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:122
 msgid ""
-"Specifying the I<--convert> option is usually a good idea, because then virt-"
-"sparsify doesn't need to try to guess the input format."
+"Specifying the I<--convert> option is usually a good idea, because then "
+"virt-sparsify doesn't need to try to guess the input format."
 msgstr ""
 
 #. type: =item
@@ -25121,8 +25128,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:179
 msgid ""
-"The I<--machine-readable> option can be used to make the output more machine "
-"friendly, which is useful when calling virt-sparsify from other programs, "
+"The I<--machine-readable> option can be used to make the output more machine"
+" friendly, which is useful when calling virt-sparsify from other programs, "
 "GUIs etc."
 msgstr ""
 
@@ -25147,9 +25154,9 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:218
 msgid ""
-"The calling program should treat messages sent to stderr as error messages.  "
-"In addition, virt-sparsify exits with a non-zero status code if there was a "
-"fatal error."
+"The calling program should treat messages sent to stderr as error messages."
+"  In addition, virt-sparsify exits with a non-zero status code if there was "
+"a fatal error."
 msgstr ""
 
 #. type: textblock
@@ -25162,8 +25169,8 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:238
 msgid ""
-"Location of the temporary directory used for the potentially large temporary "
-"overlay file."
+"Location of the temporary directory used for the potentially large temporary"
+" overlay file."
 msgstr ""
 
 #. type: textblock
@@ -25188,9 +25195,9 @@ msgstr ""
 #. type: textblock
 #: ../sparsify/virt-sparsify.pod:253
 msgid ""
-"L<virt-filesystems(1)>, L<virt-df(1)>, L<virt-resize(1)>, L<virt-rescue(1)>, "
-"L<guestfs(3)>, L<guestfish(1)>, L<truncate(1)>, L<fallocate(1)>, L<qemu-img"
-"(1)>, L<http://libguestfs.org/>."
+"L<virt-filesystems(1)>, L<virt-df(1)>, L<virt-resize(1)>, L<virt-rescue(1)>,"
+" L<guestfs(3)>, L<guestfish(1)>, L<truncate(1)>, L<fallocate(1)>, L<qemu-"
+"img(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: =head2
@@ -25212,8 +25219,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:7 ../src/guestfs-actions.pod:302
 #: ../src/guestfs-actions.pod:323
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_add_drive_opts> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_add_drive_opts> call instead."
 msgstr ""
 
 #. type: textblock
@@ -25221,8 +25228,8 @@ msgstr ""
 msgid ""
 "This call checks for the existence of C<filename>.  This stops you from "
 "specifying other types of drive which are supported by qemu such as C<nbd:> "
-"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call "
-"instead."
+"and C<http:> URLs.  To specify those, use the general C<guestfs_config> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -25389,10 +25396,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:60
 msgid ""
-"This function adds the disk(s) attached to the named libvirt domain C<dom>.  "
-"It works by connecting to libvirt, requesting the domain and domain XML from "
-"libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on each "
-"one."
+"This function adds the disk(s) attached to the named libvirt domain C<dom>."
+"  It works by connecting to libvirt, requesting the domain and domain XML "
+"from libvirt, parsing it for disks, and calling C<guestfs_add_drive_opts> on"
+" each one."
 msgstr ""
 
 #. type: textblock
@@ -25502,8 +25509,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:176
 msgid ""
-"This function is the equivalent of calling C<guestfs_add_drive_opts> with no "
-"optional parameters, so the disk is added writable, with the format being "
+"This function is the equivalent of calling C<guestfs_add_drive_opts> with no"
+" optional parameters, so the disk is added writable, with the format being "
 "detected automatically."
 msgstr ""
 
@@ -25547,8 +25554,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:233
 msgid ""
-"This forces the image format.  If you omit this (or use C<guestfs_add_drive> "
-"or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
+"This forces the image format.  If you omit this (or use C<guestfs_add_drive>"
+" or C<guestfs_add_drive_ro>) then the format is automatically detected.  "
 "Possible formats include C<raw> and C<qcow2>."
 msgstr ""
 
@@ -25653,8 +25660,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:309
 msgid ""
-"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the "
-"QEMU interface emulation to use at run time."
+"This is the same as C<guestfs_add_drive_ro> but it allows you to specify the"
+" QEMU interface emulation to use at run time."
 msgstr ""
 
 #. type: textblock
@@ -25723,9 +25730,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:355
 msgid ""
-"Close the current Augeas handle and free up any resources used by it.  After "
-"calling this, you have to call C<guestfs_aug_init> again before you can use "
-"any other Augeas functions."
+"Close the current Augeas handle and free up any resources used by it.  After"
+" calling this, you have to call C<guestfs_aug_init> again before you can use"
+" any other Augeas functions."
 msgstr ""
 
 #. type: textblock
@@ -25865,9 +25872,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:457
 msgid ""
-"This option is only useful when debugging Augeas lenses.  Use of this option "
-"may require additional memory for the libguestfs appliance.  You may need to "
-"set the C<LIBGUESTFS_MEMSIZE> environment variable or call "
+"This option is only useful when debugging Augeas lenses.  Use of this option"
+" may require additional memory for the libguestfs appliance.  You may need "
+"to set the C<LIBGUESTFS_MEMSIZE> environment variable or call "
 "C<guestfs_set_memsize>."
 msgstr ""
 
@@ -25971,9 +25978,9 @@ msgstr ""
 #: ../src/guestfs-actions.pod:8345 ../src/guestfs-actions.pod:8391
 #: ../src/guestfs-actions.pod:8410
 msgid ""
-"This function returns a NULL-terminated array of strings (like L<environ(3)"
-">), or NULL if there was an error.  I<The caller must free the strings and "
-"the array after use>."
+"This function returns a NULL-terminated array of strings (like "
+"L<environ(3)>), or NULL if there was an error.  I<The caller must free the "
+"strings and the array after use>."
 msgstr ""
 
 #. type: textblock
@@ -26576,8 +26583,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:970
 msgid ""
-"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return C<"
-"\"/WINDOWS/system32\"> (the exact return value would depend on details of "
+"Thus C<guestfs_case_sensitive_path> (\"/Windows/System32\")  might return "
+"C<\"/WINDOWS/system32\"> (the exact return value would depend on details of "
 "how the directories were originally created under Windows)."
 msgstr ""
 
@@ -26766,8 +26773,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1152
 msgid ""
 "The single parameter is an argv-style list of arguments.  The first element "
-"is the name of the program to run.  Subsequent elements are parameters.  The "
-"list must be non-empty (ie. must contain a program name).  Note that the "
+"is the name of the program to run.  Subsequent elements are parameters.  The"
+" list must be non-empty (ie. must contain a program name).  Note that the "
 "command runs directly, and is I<not> invoked via the shell (see "
 "C<guestfs_sh>)."
 msgstr ""
@@ -26796,8 +26803,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1191
 msgid ""
-"This is the same as C<guestfs_command>, but splits the result into a list of "
-"lines."
+"This is the same as C<guestfs_command>, but splits the result into a list of"
+" lines."
 msgstr ""
 
 #. type: textblock
@@ -26980,21 +26987,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1336
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_device_to_device"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1338
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_luks_kill_slot (guestfs_h *g,\n"
-#| "                         const char *device,\n"
-#| "                         const char *key,\n"
-#| "                         int keyslot);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_device (guestfs_h *g,\n"
@@ -27003,12 +27001,6 @@ msgid ""
 "                                ...);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_luks_kill_slot (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         const char *key,\n"
-"                         int keyslot);\n"
-"\n"
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1349
@@ -27041,27 +27033,18 @@ msgstr ""
 msgid ""
 "This long-running command can generate progress notification messages so "
 "that the caller can display a progress bar or indicator.  To receive these "
-"messages, the caller must register a progress event callback.  See L<guestfs"
-"(3)/GUESTFS_EVENT_PROGRESS>."
+"messages, the caller must register a progress event callback.  See "
+"L<guestfs(3)/GUESTFS_EVENT_PROGRESS>."
 msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1379
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_device_to_device_va"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1381
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_va (guestfs_h *g,\n"
-#| "                       const char *fstype,\n"
-#| "                       const char *device,\n"
-#| "                       va_list args);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_device_va (guestfs_h *g,\n"
@@ -27070,12 +27053,6 @@ msgid ""
 "                                   va_list args);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_va (guestfs_h *g,\n"
-"                       const char *fstype,\n"
-"                       const char *device,\n"
-"                       va_list args);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1387
@@ -27084,21 +27061,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1391
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_device_to_device_argv"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1393
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-#| "                         const char *fstype,\n"
-#| "                         const char *device,\n"
-#| "                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_device_argv (guestfs_h *g,\n"
@@ -27107,12 +27075,6 @@ msgid ""
 "                                     const struct guestfs_copy_device_to_device_argv *optargs);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-"                         const char *fstype,\n"
-"                         const char *device,\n"
-"                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1399
@@ -27121,21 +27083,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1403
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_device_to_file"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1405
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_luks_kill_slot (guestfs_h *g,\n"
-#| "                         const char *device,\n"
-#| "                         const char *key,\n"
-#| "                         int keyslot);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_file (guestfs_h *g,\n"
@@ -27144,12 +27097,6 @@ msgid ""
 "                              ...);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_luks_kill_slot (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         const char *key,\n"
-"                         int keyslot);\n"
-"\n"
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1416
@@ -27170,21 +27117,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1430
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_device_to_file_va"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1432
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_va (guestfs_h *g,\n"
-#| "                       const char *fstype,\n"
-#| "                       const char *device,\n"
-#| "                       va_list args);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_file_va (guestfs_h *g,\n"
@@ -27193,12 +27131,6 @@ msgid ""
 "                                 va_list args);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_va (guestfs_h *g,\n"
-"                       const char *fstype,\n"
-"                       const char *device,\n"
-"                       va_list args);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1438
@@ -27207,21 +27139,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1442
-#, fuzzy
-#| msgid "guestfs_lvm_set_filter"
 msgid "guestfs_copy_device_to_file_argv"
-msgstr "guestfs_lvm_set_filter"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1444
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-#| "                         const char *fstype,\n"
-#| "                         const char *device,\n"
-#| "                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_device_to_file_argv (guestfs_h *g,\n"
@@ -27230,12 +27153,6 @@ msgid ""
 "                                   const struct guestfs_copy_device_to_file_argv *optargs);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-"                         const char *fstype,\n"
-"                         const char *device,\n"
-"                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1450
@@ -27244,21 +27161,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1454
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_file_to_device"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1456
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_luks_kill_slot (guestfs_h *g,\n"
-#| "                         const char *device,\n"
-#| "                         const char *key,\n"
-#| "                         int keyslot);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_device (guestfs_h *g,\n"
@@ -27267,12 +27175,6 @@ msgid ""
 "                              ...);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_luks_kill_slot (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         const char *key,\n"
-"                         int keyslot);\n"
-"\n"
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1467
@@ -27286,21 +27188,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1481
-#, fuzzy
-#| msgid "guestfs_zero_device"
 msgid "guestfs_copy_file_to_device_va"
-msgstr "guestfs_zero_device"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1483
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_va (guestfs_h *g,\n"
-#| "                       const char *fstype,\n"
-#| "                       const char *device,\n"
-#| "                       va_list args);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_device_va (guestfs_h *g,\n"
@@ -27309,12 +27202,6 @@ msgid ""
 "                                 va_list args);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_va (guestfs_h *g,\n"
-"                       const char *fstype,\n"
-"                       const char *device,\n"
-"                       va_list args);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1489
@@ -27323,21 +27210,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1493
-#, fuzzy
-#| msgid "guestfs_btrfs_filesystem_resize_argv"
 msgid "guestfs_copy_file_to_device_argv"
-msgstr "guestfs_btrfs_filesystem_resize_argv"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1495
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-#| "                         const char *fstype,\n"
-#| "                         const char *device,\n"
-#| "                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_device_argv (guestfs_h *g,\n"
@@ -27346,12 +27224,6 @@ msgid ""
 "                                   const struct guestfs_copy_file_to_device_argv *optargs);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-"                         const char *fstype,\n"
-"                         const char *device,\n"
-"                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1501
@@ -27360,21 +27232,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1505
-#, fuzzy
-#| msgid "guestfs_write_file"
 msgid "guestfs_copy_file_to_file"
-msgstr "guestfs_write_file"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1507
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_luks_kill_slot (guestfs_h *g,\n"
-#| "                         const char *device,\n"
-#| "                         const char *key,\n"
-#| "                         int keyslot);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_file (guestfs_h *g,\n"
@@ -27383,12 +27246,6 @@ msgid ""
 "                            ...);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_luks_kill_slot (guestfs_h *g,\n"
-"                         const char *device,\n"
-"                         const char *key,\n"
-"                         int keyslot);\n"
-"\n"
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1518
@@ -27403,28 +27260,19 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1525
 msgid ""
-"This is B<not> the function you want for copying files.  This is for copying "
-"blocks within existing files.  See C<guestfs_cp>, C<guestfs_cp_a> and "
+"This is B<not> the function you want for copying files.  This is for copying"
+" blocks within existing files.  See C<guestfs_cp>, C<guestfs_cp_a> and "
 "C<guestfs_mv> for general file copying and moving functions."
 msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1537
-#, fuzzy
-#| msgid "guestfs_write_file"
 msgid "guestfs_copy_file_to_file_va"
-msgstr "guestfs_write_file"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1539
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_va (guestfs_h *g,\n"
-#| "                       const char *fstype,\n"
-#| "                       const char *device,\n"
-#| "                       va_list args);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_file_va (guestfs_h *g,\n"
@@ -27433,12 +27281,6 @@ msgid ""
 "                               va_list args);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_va (guestfs_h *g,\n"
-"                       const char *fstype,\n"
-"                       const char *device,\n"
-"                       va_list args);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1545
@@ -27447,21 +27289,12 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:1549
-#, fuzzy
-#| msgid "guestfs_btrfs_filesystem_resize_argv"
 msgid "guestfs_copy_file_to_file_argv"
-msgstr "guestfs_btrfs_filesystem_resize_argv"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:1551
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-#| "                         const char *fstype,\n"
-#| "                         const char *device,\n"
-#| "                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_copy_file_to_file_argv (guestfs_h *g,\n"
@@ -27470,12 +27303,6 @@ msgid ""
 "                                 const struct guestfs_copy_file_to_file_argv *optargs);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkfs_opts_argv (guestfs_h *g,\n"
-"                         const char *fstype,\n"
-"                         const char *device,\n"
-"                         const struct guestfs_mkfs_opts_argv *optargs);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:1557
@@ -27502,8 +27329,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1569 ../src/guestfs-actions.pod:1626
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_copy_device_to_device> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_copy_device_to_device> call instead."
 msgstr ""
 
 #. type: textblock
@@ -27573,8 +27400,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1638
 msgid ""
 "If the destination is a device, it must be as large or larger than the "
-"source file or device, otherwise the copy will fail.  This command cannot do "
-"partial copies (see C<guestfs_copy_device_to_device>)."
+"source file or device, otherwise the copy will fail.  This command cannot do"
+" partial copies (see C<guestfs_copy_device_to_device>)."
 msgstr ""
 
 #. type: =head2
@@ -27689,8 +27516,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:1737
 msgid ""
 "Note that there is no limit on the amount of data that can be downloaded "
-"with this call, unlike with C<guestfs_pread>, and this call always reads the "
-"full amount unless an error occurs."
+"with this call, unlike with C<guestfs_pread>, and this call always reads the"
+" full amount unless an error occurs."
 msgstr ""
 
 #. type: textblock
@@ -27903,8 +27730,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:1909
 msgid ""
-"I<This function is deprecated.> In new code, use the L</guestfs_fallocate64> "
-"call instead."
+"I<This function is deprecated.> In new code, use the L</guestfs_fallocate64>"
+" call instead."
 msgstr ""
 
 #. type: =head2
@@ -28250,8 +28077,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2362
 msgid ""
-"This function returns a string which may be NULL.  There is no way to return "
-"an error from this function.  The string is owned by the guest handle and "
+"This function returns a string which may be NULL.  There is no way to return"
+" an error from this function.  The string is owned by the guest handle and "
 "must I<not> be freed."
 msgstr ""
 
@@ -28389,8 +28216,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2452
 msgid ""
 "If C<guestfs_set_memsize> was not called on this handle, and if "
-"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default "
-"value for memsize."
+"C<LIBGUESTFS_MEMSIZE> was not set, then this returns the compiled-in default"
+" value for memsize."
 msgstr ""
 
 #. type: textblock
@@ -28611,8 +28438,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2596
 msgid ""
-"Return the current umask.  By default the umask is C<022> unless it has been "
-"set by calling C<guestfs_umask>."
+"Return the current umask.  By default the umask is C<022> unless it has been"
+" set by calling C<guestfs_umask>."
 msgstr ""
 
 #. type: =head2
@@ -28696,8 +28523,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6284
 msgid ""
 "This function returns a buffer, or NULL on error.  The size of the returned "
-"buffer is written to C<*size_r>.  I<The caller must free the returned buffer "
-"after use>."
+"buffer is written to C<*size_r>.  I<The caller must free the returned buffer"
+" after use>."
 msgstr ""
 
 #. type: textblock
@@ -28729,8 +28556,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2673 ../src/guestfs-actions.pod:4164
 #: ../src/guestfs-actions.pod:4852
 msgid ""
-"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was "
-"an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
+"This function returns a C<struct guestfs_xattr_list *>, or NULL if there was"
+" an error.  I<The caller must call C<guestfs_free_xattr_list> after use>."
 msgstr ""
 
 #. type: textblock
@@ -28951,8 +28778,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2936
 msgid ""
-"This function is a helpful wrapper around C<guestfs_inotify_read> which just "
-"returns a list of pathnames of objects that were touched.  The returned "
+"This function is a helpful wrapper around C<guestfs_inotify_read> which just"
+" returns a list of pathnames of objects that were touched.  The returned "
 "pathnames are sorted and deduplicated."
 msgstr ""
 
@@ -28974,8 +28801,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:2956
 msgid ""
-"C<maxevents> is the maximum number of events which will be queued up between "
-"calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
+"C<maxevents> is the maximum number of events which will be queued up between"
+" calls to C<guestfs_inotify_read> or C<guestfs_inotify_files>.  If this is "
 "passed as C<0>, then the kernel (or previously set)  default is used.  For "
 "Linux 2.6.29 the default was 16384 events.  Beyond this limit, the kernel "
 "throws away events, but records the fact that it threw them away by setting "
@@ -28995,8 +28822,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:2972
 msgid ""
 "Queued up events should be read periodically by calling "
-"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful "
-"wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
+"C<guestfs_inotify_read> (or C<guestfs_inotify_files> which is just a helpful"
+" wrapper around C<guestfs_inotify_read>).  If you don't read the events out "
 "often enough then you risk the internal queue overflowing."
 msgstr ""
 
@@ -29047,7 +28874,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:3020
 msgid ""
-"Remove a previously defined inotify watch.  See C<guestfs_inotify_add_watch>."
+"Remove a previously defined inotify watch.  See "
+"C<guestfs_inotify_add_watch>."
 msgstr ""
 
 #. type: =head2
@@ -29353,8 +29181,8 @@ msgstr ""
 msgid ""
 "This function and C<guestfs_inspect_get_package_management> return the "
 "package format and package management tool used by the inspected operating "
-"system.  For example for Fedora these functions would return C<rpm> (package "
-"format) and C<yum> (package management)."
+"system.  For example for Fedora these functions would return C<rpm> (package"
+" format) and C<yum> (package management)."
 msgstr ""
 
 #. type: textblock
@@ -29598,13 +29426,13 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:3731
 msgid ""
-"I<Note:> This call works differently from other parts of the inspection "
-"API.  You have to call C<guestfs_inspect_os>, then "
+"I<Note:> This call works differently from other parts of the inspection API."
+"  You have to call C<guestfs_inspect_os>, then "
 "C<guestfs_inspect_get_mountpoints>, then mount up the disks, before calling "
 "this.  Listing applications is a significantly more difficult operation "
 "which requires access to the full filesystem.  Also note that unlike the "
-"other C<guestfs_inspect_get_*> calls which are just returning data cached in "
-"the libguestfs handle, this call actually reads parts of the mounted "
+"other C<guestfs_inspect_get_*> calls which are just returning data cached in"
+" the libguestfs handle, this call actually reads parts of the mounted "
 "filesystems during the call."
 msgstr ""
 
@@ -29612,8 +29440,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:3821
 msgid ""
 "This function returns a C<struct guestfs_application_list *>, or NULL if "
-"there was an error.  I<The caller must call C<guestfs_free_application_list> "
-"after use>."
+"there was an error.  I<The caller must call C<guestfs_free_application_list>"
+" after use>."
 msgstr ""
 
 #. type: textblock
@@ -29639,16 +29467,16 @@ msgstr ""
 #: ../src/guestfs-actions.pod:3845
 msgid ""
 "You can pass the root string(s) returned to other C<guestfs_inspect_get_*> "
-"functions in order to query further information about each operating system, "
-"such as the name and version."
+"functions in order to query further information about each operating system,"
+" such as the name and version."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:3850
 msgid ""
-"This function uses other libguestfs features such as C<guestfs_mount_ro> and "
-"C<guestfs_umount_all> in order to mount and unmount filesystems and look at "
-"the contents.  This should be called with no disks currently mounted.  The "
+"This function uses other libguestfs features such as C<guestfs_mount_ro> and"
+" C<guestfs_umount_all> in order to mount and unmount filesystems and look at"
+" the contents.  This should be called with no disks currently mounted.  The "
 "function may also use Augeas, so any existing Augeas handle will be closed."
 msgstr ""
 
@@ -29977,8 +29805,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4160
 msgid ""
-"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link, "
-"then it returns the extended attributes of the link itself."
+"This is the same as C<guestfs_getxattrs>, but if C<path> is a symbolic link,"
+" then it returns the extended attributes of the link itself."
 msgstr ""
 
 #. type: =head2
@@ -30072,7 +29900,8 @@ msgid ""
 "partitions are returned in the list.  Also this command does not check that "
 "each filesystem found is valid and mountable, and some filesystems might be "
 "mountable but require special options.  Filesystems may not all belong to a "
-"single logical operating system (use C<guestfs_inspect_os> to look for OSes)."
+"single logical operating system (use C<guestfs_inspect_os> to look for "
+"OSes)."
 msgstr ""
 
 #. type: textblock
@@ -30364,8 +30193,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4441
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lxattrlist> "
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also C<guestfs_lxattrlist> "
 "for a similarly efficient call for getting extended attributes.  Very long "
 "directory listings might cause the protocol message size to be exceeded, "
 "causing this call to fail.  The caller must split up such requests into "
@@ -30407,8 +30236,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4469
 msgid ""
-"Note that if C<keyslot> already contains a key, then this command will "
-"fail.  You have to use C<guestfs_luks_kill_slot> first to remove that key."
+"Note that if C<keyslot> already contains a key, then this command will fail."
+"  You have to use C<guestfs_luks_kill_slot> first to remove that key."
 msgstr ""
 
 #. type: textblock
@@ -30450,9 +30279,9 @@ msgstr ""
 #: ../src/guestfs-actions.pod:4487
 msgid ""
 "This closes a LUKS device that was created earlier by C<guestfs_luks_open> "
-"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the "
-"LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the "
-"underlying block device."
+"or C<guestfs_luks_open_ro>.  The C<device> parameter must be the name of the"
+" LUKS mapping device (ie. C</dev/mapper/mapname>) and I<not> the name of the"
+" underlying block device."
 msgstr ""
 
 #. type: textblock
@@ -30513,8 +30342,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4530
 msgid ""
-"This command is the same as C<guestfs_luks_format> but it also allows you to "
-"set the C<cipher> used."
+"This command is the same as C<guestfs_luks_format> but it also allows you to"
+" set the C<cipher> used."
 msgstr ""
 
 #. type: =head2
@@ -30859,7 +30688,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:4804
 msgid ""
 "This function returns a C<struct guestfs_lvm_lv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_lv_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -30905,12 +30735,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:4844
 msgid ""
-"This call is intended for programs that want to efficiently list a directory "
-"contents without making many round-trips.  See also C<guestfs_lstatlist> for "
-"a similarly efficient call for getting standard stats.  Very long directory "
-"listings might cause the protocol message size to be exceeded, causing this "
-"call to fail.  The caller must split up such requests into smaller groups of "
-"names."
+"This call is intended for programs that want to efficiently list a directory"
+" contents without making many round-trips.  See also C<guestfs_lstatlist> "
+"for a similarly efficient call for getting standard stats.  Very long "
+"directory listings might cause the protocol message size to be exceeded, "
+"causing this call to fail.  The caller must split up such requests into "
+"smaller groups of names."
 msgstr ""
 
 #. type: =head2
@@ -31244,8 +31074,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5081
 msgid ""
 "This call is similar to C<guestfs_mkfs>, but it allows you to control the "
-"block size of the resulting filesystem.  Supported block sizes depend on the "
-"filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
+"block size of the resulting filesystem.  Supported block sizes depend on the"
+" filesystem type, but typically they are C<1024>, C<2048> or C<4096> only."
 msgstr ""
 
 #. type: =head2
@@ -31391,8 +31221,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5221
 msgid ""
 "Autosync [see C<guestfs_set_autosync>, this is set by default on handles] "
-"can cause C<guestfs_umount_all> to be called when the handle is closed which "
-"can also trigger these issues."
+"can cause C<guestfs_umount_all> to be called when the handle is closed which"
+" can also trigger these issues."
 msgstr ""
 
 #. type: textblock
@@ -31426,8 +31256,8 @@ msgid ""
 "S_IFBLK, S_IFCHR, S_IFIFO or S_IFSOCK (otherwise this call just creates a "
 "regular file).  These constants are available in the standard Linux header "
 "files, or you can use C<guestfs_mknod_b>, C<guestfs_mknod_c> or "
-"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in "
-"the appropriate constant for you."
+"C<guestfs_mkfifo> which are wrappers around this command which bitwise OR in"
+" the appropriate constant for you."
 msgstr ""
 
 #. type: =head2
@@ -31752,8 +31582,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:5510
 msgid ""
 "This is the same as the C<guestfs_mount> command, but it allows you to set "
-"both the mount options and the vfstype as for the L<mount(8)> I<-o> and I<-"
-"t> flags."
+"both the mount options and the vfstype as for the L<mount(8)> I<-o> and "
+"I<-t> flags."
 msgstr ""
 
 #. type: =head2
@@ -31852,8 +31682,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5596 ../src/guestfs-actions.pod:5696
 msgid ""
-"I<This function is deprecated.> In new code, use the L</"
-"guestfs_ntfsresize_opts> call instead."
+"I<This function is deprecated.> In new code, use the "
+"L</guestfs_ntfsresize_opts> call instead."
 msgstr ""
 
 #. type: =head2
@@ -32047,8 +31877,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5766
 msgid ""
-"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other "
-"possible values are described in C<guestfs_part_init>."
+"C<parttype> is the partition table type, usually C<mbr> or C<gpt>, but other"
+" possible values are described in C<guestfs_part_init>."
 msgstr ""
 
 #. type: =head2
@@ -32091,8 +31921,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5802 ../src/guestfs-actions.pod:5984
 msgid ""
-"Note that only MBR (old DOS-style) partitions have type bytes.  You will get "
-"undefined results for other partition table types (see "
+"Note that only MBR (old DOS-style) partitions have type bytes.  You will get"
+" undefined results for other partition table types (see "
 "C<guestfs_part_get_parttype>)."
 msgstr ""
 
@@ -32171,8 +32001,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:5945
 msgid ""
-"This function returns a C<struct guestfs_partition_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_partition_list> after "
+"This function returns a C<struct guestfs_partition_list *>, or NULL if there"
+" was an error.  I<The caller must call C<guestfs_free_partition_list> after "
 "use>."
 msgstr ""
 
@@ -32256,36 +32086,23 @@ msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:6030
-#, fuzzy
-#| msgid "guestfs_part_list"
 msgid "guestfs_part_to_partnum"
-msgstr "guestfs_part_list"
+msgstr ""
 
 #. type: verbatim
 #: ../src/guestfs-actions.pod:6032
-#, fuzzy, no-wrap
-#| msgid ""
-#| " int\n"
-#| " guestfs_mkdir_p (guestfs_h *g,\n"
-#| "                  const char *path);\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " int\n"
 " guestfs_part_to_partnum (guestfs_h *g,\n"
 "                          const char *partition);\n"
 "\n"
 msgstr ""
-" int\n"
-" guestfs_mkdir_p (guestfs_h *g,\n"
-"                  const char *path);\n"
-"\n"
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:6042
-#, fuzzy
-#| msgid "See also L</stat>."
 msgid "See also C<guestfs_part_to_dev>."
-msgstr "Див. також L</stat>."
+msgstr ""
 
 #. type: =head2
 #: ../src/guestfs-actions.pod:6046
@@ -32416,8 +32233,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6163
 msgid ""
-"This command is the same as C<guestfs_pvresize> except that it allows you to "
-"specify the new size (in bytes) explicitly."
+"This command is the same as C<guestfs_pvresize> except that it allows you to"
+" specify the new size (in bytes) explicitly."
 msgstr ""
 
 #. type: =head2
@@ -32457,7 +32274,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6197
 msgid ""
 "This function returns a C<struct guestfs_lvm_pv_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_pv_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -32545,8 +32363,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6279
 msgid ""
-"Unlike C<guestfs_cat>, this function can correctly handle files that contain "
-"embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
+"Unlike C<guestfs_cat>, this function can correctly handle files that contain"
+" embedded ASCII NUL characters.  However unlike C<guestfs_download>, this "
 "function is limited in the total size of file that can be handled."
 msgstr ""
 
@@ -32606,7 +32424,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:6375
 msgid ""
 "This function returns a C<struct guestfs_dirent_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_dirent_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_dirent_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -32876,10 +32695,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6606
 msgid ""
-"This command creates the directory C<dir> and then fills it with files until "
-"the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
-"and deletes them.  The intention is to scrub any free space on the partition "
-"containing C<dir>."
+"This command creates the directory C<dir> and then fills it with files until"
+" the filesystem is full, and scrubs the files as for C<guestfs_scrub_file>, "
+"and deletes them.  The intention is to scrub any free space on the partition"
+" containing C<dir>."
 msgstr ""
 
 #. type: =head2
@@ -33112,8 +32931,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:6861
 msgid ""
-"This only has any effect if called before C<guestfs_launch>, and the default "
-"is true."
+"This only has any effect if called before C<guestfs_launch>, and the default"
+" is true."
 msgstr ""
 
 #. type: =head2
@@ -33348,9 +33167,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7102
 msgid ""
-"This displays the disk geometry of C<device> read from the partition table.  "
-"Especially in the case where the underlying block device has been resized, "
-"this can be different from the kernel's idea of the geometry (see "
+"This displays the disk geometry of C<device> read from the partition table."
+"  Especially in the case where the underlying block device has been resized,"
+" this can be different from the kernel's idea of the geometry (see "
 "C<guestfs_sfdisk_kernel_geometry>)."
 msgstr ""
 
@@ -33501,8 +33320,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7236
 msgid ""
-"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_statvfs> after use>."
+"This function returns a C<struct guestfs_statvfs *>, or NULL if there was an"
+" error.  I<The caller must call C<guestfs_free_statvfs> after use>."
 msgstr ""
 
 #. type: =head2
@@ -33658,8 +33477,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7395
 msgid ""
-"This command enables swap to a file.  See C<guestfs_swapon_device> for other "
-"notes."
+"This command enables swap to a file.  See C<guestfs_swapon_device> for other"
+" notes."
 msgstr ""
 
 #. type: =head2
@@ -34093,8 +33912,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:7829
 msgid ""
-"This function returns a C<struct guestfs_version *>, or NULL if there was an "
-"error.  I<The caller must call C<guestfs_free_version> after use>."
+"This function returns a C<struct guestfs_version *>, or NULL if there was an"
+" error.  I<The caller must call C<guestfs_free_version> after use>."
 msgstr ""
 
 #. type: textblock
@@ -34331,7 +34150,8 @@ msgstr ""
 #: ../src/guestfs-actions.pod:8033
 msgid ""
 "This function returns a C<struct guestfs_lvm_vg_list *>, or NULL if there "
-"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after use>."
+"was an error.  I<The caller must call C<guestfs_free_lvm_vg_list> after "
+"use>."
 msgstr ""
 
 #. type: =head2
@@ -34380,8 +34200,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:8069
 msgid ""
-"I<This function is deprecated.> In new code, use the L</guestfs_launch> call "
-"instead."
+"I<This function is deprecated.> In new code, use the L</guestfs_launch> call"
+" instead."
 msgstr ""
 
 #. type: textblock
@@ -34392,16 +34212,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs-actions.pod:8078
 msgid ""
-"In versions of the API E<lt> 1.0.71 you had to call this function just after "
-"calling C<guestfs_launch> to wait for the launch to complete.  However this "
-"is no longer necessary because C<guestfs_launch> now does the waiting."
+"In versions of the API E<lt> 1.0.71 you had to call this function just after"
+" calling C<guestfs_launch> to wait for the launch to complete.  However this"
+" is no longer necessary because C<guestfs_launch> now does the waiting."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs-actions.pod:8083
 msgid ""
-"If you see any calls to this function in code then you can just remove them, "
-"unless you want to retain compatibility with older versions of the API."
+"If you see any calls to this function in code then you can just remove them,"
+" unless you want to retain compatibility with older versions of the API."
 msgstr ""
 
 #. type: =head2
@@ -34768,11 +34588,11 @@ msgstr "B<augeas>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:5
 msgid ""
-"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> L</"
-"guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> L</"
-"guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> L</"
-"guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> L</guestfs_aug_rm> "
-"L</guestfs_aug_save> L</guestfs_aug_set>"
+"The following functions: L</guestfs_aug_clear> L</guestfs_aug_close> "
+"L</guestfs_aug_defnode> L</guestfs_aug_defvar> L</guestfs_aug_get> "
+"L</guestfs_aug_init> L</guestfs_aug_insert> L</guestfs_aug_load> "
+"L</guestfs_aug_ls> L</guestfs_aug_match> L</guestfs_aug_mv> "
+"L</guestfs_aug_rm> L</guestfs_aug_save> L</guestfs_aug_set>"
 msgstr ""
 
 #. type: =item
@@ -34803,9 +34623,9 @@ msgstr "B<inotify>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:33
 msgid ""
-"The following functions: L</guestfs_inotify_add_watch> L</"
-"guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init> L</"
-"guestfs_inotify_read> L</guestfs_inotify_rm_watch>"
+"The following functions: L</guestfs_inotify_add_watch> "
+"L</guestfs_inotify_close> L</guestfs_inotify_files> L</guestfs_inotify_init>"
+" L</guestfs_inotify_read> L</guestfs_inotify_rm_watch>"
 msgstr ""
 
 #. type: =item
@@ -34816,8 +34636,8 @@ msgstr "B<linuxfsuuid>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:43
 msgid ""
-"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> L</"
-"guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"
+"The following functions: L</guestfs_mke2fs_JU> L</guestfs_mke2journal_U> "
+"L</guestfs_mkswap_U> L</guestfs_swapoff_uuid> L</guestfs_swapon_uuid>"
 msgstr ""
 
 #. type: =item
@@ -34838,10 +34658,10 @@ msgstr "B<linuxxattrs>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:57
 msgid ""
-"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> L</"
-"guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> L</"
-"guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> L</"
-"guestfs_setxattr>"
+"The following functions: L</guestfs_getxattr> L</guestfs_getxattrs> "
+"L</guestfs_lgetxattr> L</guestfs_lgetxattrs> L</guestfs_lremovexattr> "
+"L</guestfs_lsetxattr> L</guestfs_lxattrlist> L</guestfs_removexattr> "
+"L</guestfs_setxattr>"
 msgstr ""
 
 #. type: =item
@@ -34852,9 +34672,9 @@ msgstr "B<luks>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:70
 msgid ""
-"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> L</"
-"guestfs_luks_format> L</guestfs_luks_format_cipher> L</"
-"guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"
+"The following functions: L</guestfs_luks_add_key> L</guestfs_luks_close> "
+"L</guestfs_luks_format> L</guestfs_luks_format_cipher> "
+"L</guestfs_luks_kill_slot> L</guestfs_luks_open> L</guestfs_luks_open_ro>"
 msgstr ""
 
 #. type: =item
@@ -34865,13 +34685,14 @@ msgstr "B<lvm2>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:81
 msgid ""
-"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> L</"
-"guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> L</"
-"guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> L</"
-"guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> L</"
-"guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> L</"
-"guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> L</"
-"guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> L</guestfs_vgs_full>"
+"The following functions: L</guestfs_is_lv> L</guestfs_lvcreate> "
+"L</guestfs_lvm_remove_all> L</guestfs_lvm_set_filter> L</guestfs_lvremove> "
+"L</guestfs_lvresize> L</guestfs_lvresize_free> L</guestfs_lvs> "
+"L</guestfs_lvs_full> L</guestfs_pvcreate> L</guestfs_pvremove> "
+"L</guestfs_pvresize> L</guestfs_pvresize_size> L</guestfs_pvs> "
+"L</guestfs_pvs_full> L</guestfs_vg_activate> L</guestfs_vg_activate_all> "
+"L</guestfs_vgcreate> L</guestfs_vgremove> L</guestfs_vgs> "
+"L</guestfs_vgs_full>"
 msgstr ""
 
 #. type: =item
@@ -34882,8 +34703,8 @@ msgstr "B<mknod>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:106
 msgid ""
-"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> L</"
-"guestfs_mknod_b> L</guestfs_mknod_c>"
+"The following functions: L</guestfs_mkfifo> L</guestfs_mknod> "
+"L</guestfs_mknod_b> L</guestfs_mknod_c>"
 msgstr ""
 
 #. type: =item
@@ -34926,8 +34747,8 @@ msgstr "B<scrub>"
 #. type: textblock
 #: ../src/guestfs-availability.pod:131
 msgid ""
-"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> L</"
-"guestfs_scrub_freespace>"
+"The following functions: L</guestfs_scrub_device> L</guestfs_scrub_file> "
+"L</guestfs_scrub_freespace>"
 msgstr ""
 
 #. type: =item
@@ -35507,9 +35328,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:33
 msgid ""
-"Libguestfs uses Linux kernel and qemu code, and can access any type of guest "
-"filesystem that Linux and qemu can, including but not limited to: ext2/3/4, "
-"btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, "
+"Libguestfs uses Linux kernel and qemu code, and can access any type of guest"
+" filesystem that Linux and qemu can, including but not limited to: ext2/3/4,"
+" btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, "
 "qcow2, vmdk."
 msgstr ""
 
@@ -35525,9 +35346,9 @@ msgstr ""
 #: ../src/guestfs.pod:43
 msgid ""
 "Libguestfs is a library that can be linked with C and C++ management "
-"programs (or management programs written in OCaml, Perl, Python, Ruby, Java, "
-"PHP, Erlang, Haskell or C#).  You can also use it from shell scripts or the "
-"command line."
+"programs (or management programs written in OCaml, Perl, Python, Ruby, Java,"
+" PHP, Erlang, Haskell or C#).  You can also use it from shell scripts or the"
+" command line."
 msgstr ""
 
 #. type: textblock
@@ -35559,8 +35380,8 @@ msgstr "ОГЛЯД API"
 #. type: textblock
 #: ../src/guestfs.pod:59
 msgid ""
-"This section provides a gentler overview of the libguestfs API.  We also try "
-"to group API calls together, where that may not be obvious from reading "
+"This section provides a gentler overview of the libguestfs API.  We also try"
+" to group API calls together, where that may not be obvious from reading "
 "about the individual calls in the main section of this manual."
 msgstr ""
 
@@ -35575,13 +35396,14 @@ msgid ""
 "Before you can use libguestfs calls, you have to create a handle.  Then you "
 "must add at least one disk image to the handle, followed by launching the "
 "handle, then performing whatever operations you want, and finally closing "
-"the handle.  By convention we use the single letter C<g> for the name of the "
-"handle variable, although of course you can use any name you want."
+"the handle.  By convention we use the single letter C<g> for the name of the"
+" handle variable, although of course you can use any name you want."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:73
-msgid "The general structure of all libguestfs-using programs looks like this:"
+msgid ""
+"The general structure of all libguestfs-using programs looks like this:"
 msgstr ""
 
 #. type: verbatim
@@ -35709,16 +35531,16 @@ msgstr "ОБРАЗИ ДИСКІВ"
 msgid ""
 "The image filename (C<\"guest.img\"> in the example above) could be a disk "
 "image from a virtual machine, a L<dd(1)> copy of a physical hard disk, an "
-"actual block device, or simply an empty file of zeroes that you have created "
-"through L<posix_fallocate(3)>.  Libguestfs lets you do useful things to all "
-"of these."
+"actual block device, or simply an empty file of zeroes that you have created"
+" through L<posix_fallocate(3)>.  Libguestfs lets you do useful things to all"
+" of these."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:129
 msgid ""
-"The call you should use in modern code for adding drives is L</"
-"guestfs_add_drive_opts>.  To add a disk image, allowing writes, and "
+"The call you should use in modern code for adding drives is "
+"L</guestfs_add_drive_opts>.  To add a disk image, allowing writes, and "
 "specifying that the format is raw, do:"
 msgstr ""
 
@@ -35768,24 +35590,24 @@ msgstr ""
 #: ../src/guestfs.pod:147
 msgid ""
 "Be extremely cautious if the disk image is in use, eg. if it is being used "
-"by a virtual machine.  Adding it read-write will almost certainly cause disk "
-"corruption, but adding it read-only is safe."
+"by a virtual machine.  Adding it read-write will almost certainly cause disk"
+" corruption, but adding it read-only is safe."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:151
 msgid ""
-"You must add at least one disk image, and you may add multiple disk images.  "
-"In the API, the disk images are usually referred to as C</dev/sda> (for the "
-"first one you added), C</dev/sdb> (for the second one you added), etc."
+"You must add at least one disk image, and you may add multiple disk images."
+"  In the API, the disk images are usually referred to as C</dev/sda> (for "
+"the first one you added), C</dev/sdb> (for the second one you added), etc."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:156
 msgid ""
-"Once L</guestfs_launch> has been called you cannot add any more images.  You "
-"can call L</guestfs_list_devices> to get a list of the device names, in the "
-"order that you added them.  See also L</BLOCK DEVICE NAMING> below."
+"Once L</guestfs_launch> has been called you cannot add any more images.  You"
+" can call L</guestfs_list_devices> to get a list of the device names, in the"
+" order that you added them.  See also L</BLOCK DEVICE NAMING> below."
 msgstr ""
 
 #. type: =head2
@@ -35798,9 +35620,9 @@ msgstr "МОНТУВАННЯ"
 msgid ""
 "Before you can read or write files, create directories and so on in a disk "
 "image that contains filesystems, you have to mount those filesystems using "
-"L</guestfs_mount_options> or L</guestfs_mount_ro>.  If you already know that "
-"a disk image contains (for example) one partition with a filesystem on that "
-"partition, then you can mount it directly:"
+"L</guestfs_mount_options> or L</guestfs_mount_ro>.  If you already know that"
+" a disk image contains (for example) one partition with a filesystem on that"
+" partition, then you can mount it directly:"
 msgstr ""
 
 #. type: verbatim
@@ -35827,19 +35649,20 @@ msgstr ""
 #: ../src/guestfs.pod:178
 msgid ""
 "If you are given a disk image and you don't know what it contains then you "
-"have to find out.  Libguestfs can do that too: use L</"
-"guestfs_list_partitions> and L</guestfs_lvs> to list possible partitions and "
-"LVs, and either try mounting each to see what is mountable, or else examine "
-"them with L</guestfs_vfs_type> or L</guestfs_file>.  To list just "
+"have to find out.  Libguestfs can do that too: use "
+"L</guestfs_list_partitions> and L</guestfs_lvs> to list possible partitions "
+"and LVs, and either try mounting each to see what is mountable, or else "
+"examine them with L</guestfs_vfs_type> or L</guestfs_file>.  To list just "
 "filesystems, use L</guestfs_list_filesystems>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:186
 msgid ""
-"Libguestfs also has a set of APIs for inspection of unknown disk images (see "
-"L</INSPECTION> below).  But you might find it easier to look at higher level "
-"programs built on top of libguestfs, in particular L<virt-inspector(1)>."
+"Libguestfs also has a set of APIs for inspection of unknown disk images (see"
+" L</INSPECTION> below).  But you might find it easier to look at higher "
+"level programs built on top of libguestfs, in particular L<virt-"
+"inspector(1)>."
 msgstr ""
 
 #. type: textblock
@@ -35897,8 +35720,8 @@ msgstr ""
 #: ../src/guestfs.pod:210
 msgid ""
 "This would return C<data> as a newly allocated buffer containing the full "
-"content of that file (with some conditions: see also L</DOWNLOADING> below), "
-"or C<NULL> if there was an error."
+"content of that file (with some conditions: see also L</DOWNLOADING> below),"
+" or C<NULL> if there was an error."
 msgstr ""
 
 #. type: textblock
@@ -35921,7 +35744,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:219
 msgid "To create a symlink you could do:"
-msgstr "Щоб створити символічне посилання, ви можете скористатися таким кодом:"
+msgstr ""
+"Щоб створити символічне посилання, ви можете скористатися таким кодом:"
 
 #. type: verbatim
 #: ../src/guestfs.pod:221
@@ -35955,8 +35779,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:233
 msgid ""
-"File writes are affected by the per-handle umask, set by calling L</"
-"guestfs_umask> and defaulting to 022.  See L</UMASK>."
+"File writes are affected by the per-handle umask, set by calling "
+"L</guestfs_umask> and defaulting to 022.  See L</UMASK>."
 msgstr ""
 
 #. type: =head2
@@ -35967,8 +35791,8 @@ msgstr "ПОДІЛ НА РОЗДІЛИ"
 #. type: textblock
 #: ../src/guestfs.pod:238
 msgid ""
-"Libguestfs contains API calls to read, create and modify partition tables on "
-"disk images."
+"Libguestfs contains API calls to read, create and modify partition tables on"
+" disk images."
 msgstr ""
 
 #. type: textblock
@@ -35997,7 +35821,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:250
 msgid ""
-"Obviously this effectively wipes anything that was on that disk image before."
+"Obviously this effectively wipes anything that was on that disk image "
+"before."
 msgstr ""
 
 #. type: =head2
@@ -36008,17 +35833,17 @@ msgstr "LVM2"
 #. type: textblock
 #: ../src/guestfs.pod:255
 msgid ""
-"Libguestfs provides access to a large part of the LVM2 API, such as L</"
-"guestfs_lvcreate> and L</guestfs_vgremove>.  It won't make much sense unless "
-"you familiarize yourself with the concepts of physical volumes, volume "
-"groups and logical volumes."
+"Libguestfs provides access to a large part of the LVM2 API, such as "
+"L</guestfs_lvcreate> and L</guestfs_vgremove>.  It won't make much sense "
+"unless you familiarize yourself with the concepts of physical volumes, "
+"volume groups and logical volumes."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:260
 msgid ""
-"This author strongly recommends reading the LVM HOWTO, online at L<http://"
-"tldp.org/HOWTO/LVM-HOWTO/>."
+"This author strongly recommends reading the LVM HOWTO, online at "
+"L<http://tldp.org/HOWTO/LVM-HOWTO/>."
 msgstr ""
 
 #. type: =head2
@@ -36030,8 +35855,8 @@ msgstr "ОТРИМАННЯ ДАНИХ"
 #: ../src/guestfs.pod:265
 msgid ""
 "Use L</guestfs_cat> to download small, text only files.  This call is "
-"limited to files which are less than 2 MB and which cannot contain any ASCII "
-"NUL (C<\\0>) characters.  However the API is very simple to use."
+"limited to files which are less than 2 MB and which cannot contain any ASCII"
+" NUL (C<\\0>) characters.  However the API is very simple to use."
 msgstr ""
 
 #. type: textblock
@@ -36063,24 +35888,25 @@ msgstr "ВИВАНТАЖЕННЯ"
 #. type: textblock
 #: ../src/guestfs.pod:281
 msgid ""
-"It's often the case that you want to write a file or files to the disk image."
+"It's often the case that you want to write a file or files to the disk "
+"image."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:284
 msgid ""
 "To write a small file with fixed content, use L</guestfs_write>.  To create "
-"a file of all zeroes, use L</guestfs_truncate_size> (sparse) or L</"
-"guestfs_fallocate64> (with all disk blocks allocated).  There are a variety "
-"of other functions for creating test files, for example L</guestfs_fill> and "
-"L</guestfs_fill_pattern>."
+"a file of all zeroes, use L</guestfs_truncate_size> (sparse) or "
+"L</guestfs_fallocate64> (with all disk blocks allocated).  There are a "
+"variety of other functions for creating test files, for example "
+"L</guestfs_fill> and L</guestfs_fill_pattern>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:290
 msgid ""
-"To upload a single file, use L</guestfs_upload>.  This call has no limits on "
-"file content or size (even files larger than 4 GB)."
+"To upload a single file, use L</guestfs_upload>.  This call has no limits on"
+" file content or size (even files larger than 4 GB)."
 msgstr ""
 
 #. type: textblock
@@ -36093,14 +35919,14 @@ msgstr ""
 #: ../src/guestfs.pod:295
 msgid ""
 "However the fastest way to upload I<large numbers of arbitrary files> is to "
-"turn them into a squashfs or CD ISO (see L<mksquashfs(8)> and L<mkisofs(8)"
-">), then attach this using L</guestfs_add_drive_ro>.  If you add the drive "
-"in a predictable way (eg. adding it last after all other drives) then you "
-"can get the device name from L</guestfs_list_devices> and mount it directly "
-"using L</guestfs_mount_ro>.  Note that squashfs images are sometimes non-"
-"portable between kernel versions, and they don't support labels or UUIDs.  "
-"If you want to pre-build an image or you need to mount it using a label or "
-"UUID, use an ISO image instead."
+"turn them into a squashfs or CD ISO (see L<mksquashfs(8)> and "
+"L<mkisofs(8)>), then attach this using L</guestfs_add_drive_ro>.  If you add"
+" the drive in a predictable way (eg. adding it last after all other drives) "
+"then you can get the device name from L</guestfs_list_devices> and mount it "
+"directly using L</guestfs_mount_ro>.  Note that squashfs images are "
+"sometimes non-portable between kernel versions, and they don't support "
+"labels or UUIDs.  If you want to pre-build an image or you need to mount it "
+"using a label or UUID, use an ISO image instead."
 msgstr ""
 
 #. type: =head2
@@ -36136,30 +35962,24 @@ msgstr ""
 
 #. type: =item
 #: ../src/guestfs.pod:322
-#, fuzzy
-#| msgid "B<file> to B<file>"
 msgid "B<file> to B<device>"
-msgstr "B<файл> у B<файл>"
+msgstr ""
 
 #. type: =item
 #: ../src/guestfs.pod:324
-#, fuzzy
-#| msgid "B<file> to B<file>"
 msgid "B<device> to B<file>"
-msgstr "B<файл> у B<файл>"
+msgstr ""
 
 #. type: =item
 #: ../src/guestfs.pod:326
-#, fuzzy
-#| msgid "B<file or device> to B<file or device>"
 msgid "B<device> to B<device>"
-msgstr "B<файл або пристрій> у B<файл або пристрій>"
+msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:328
 msgid ""
-"Use L</guestfs_copy_file_to_device>, L</guestfs_copy_device_to_file>, or L</"
-"guestfs_copy_device_to_device>."
+"Use L</guestfs_copy_file_to_device>, L</guestfs_copy_device_to_file>, or "
+"L</guestfs_copy_device_to_device>."
 msgstr ""
 
 #. type: textblock
@@ -36225,12 +36045,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:359
 msgid ""
-"Calls like L</guestfs_upload>, L</guestfs_download>, L</guestfs_tar_in>, L</"
-"guestfs_tar_out> etc appear to only take filenames as arguments, so it "
+"Calls like L</guestfs_upload>, L</guestfs_download>, L</guestfs_tar_in>, "
+"L</guestfs_tar_out> etc appear to only take filenames as arguments, so it "
 "appears you can only upload and download to files.  However many Un*x-like "
-"hosts let you use the special device files C</dev/stdin>, C</dev/stdout>, C</"
-"dev/stderr> and C</dev/fd/N> to read and write from stdin, stdout, stderr, "
-"and arbitrary file descriptor N."
+"hosts let you use the special device files C</dev/stdin>, C</dev/stdout>, "
+"C</dev/stderr> and C</dev/fd/N> to read and write from stdin, stdout, "
+"stderr, and arbitrary file descriptor N."
 msgstr ""
 
 #. type: textblock
@@ -36297,7 +36117,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:390
 msgid ""
-"L</guestfs_find> and L</guestfs_find0> can be used to recursively list files."
+"L</guestfs_find> and L</guestfs_find0> can be used to recursively list "
+"files."
 msgstr ""
 
 #. type: =head2
@@ -36340,8 +36161,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:419
 msgid ""
-"The network may not be available unless you enable it (see L</"
-"guestfs_set_network>)."
+"The network may not be available unless you enable it (see "
+"L</guestfs_set_network>)."
 msgstr ""
 
 #. type: textblock
@@ -36379,16 +36200,16 @@ msgstr ""
 msgid ""
 "A secure alternative is to use libguestfs to install a \"firstboot\" script "
 "(a script which runs when the guest next boots normally), and to have this "
-"script run the commands you want in the normal context of the running guest, "
-"network security and so on.  For information about other security issues, "
+"script run the commands you want in the normal context of the running guest,"
+" network security and so on.  For information about other security issues, "
 "see L</SECURITY>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:455
 msgid ""
-"The two main API calls to run commands are L</guestfs_command> and L</"
-"guestfs_sh> (there are also variations)."
+"The two main API calls to run commands are L</guestfs_command> and "
+"L</guestfs_sh> (there are also variations)."
 msgstr ""
 
 #. type: textblock
@@ -36415,17 +36236,17 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:468
 msgid ""
-"The main Augeas calls are bound through the C<guestfs_aug_*> APIs.  We don't "
-"document Augeas itself here because there is excellent documentation on the "
-"L<http://augeas.net/> website."
+"The main Augeas calls are bound through the C<guestfs_aug_*> APIs.  We don't"
+" document Augeas itself here because there is excellent documentation on the"
+" L<http://augeas.net/> website."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:472
 msgid ""
-"If you don't want to use Augeas (you fool!) then try calling L</"
-"guestfs_read_lines> to get the file as a list of lines which you can iterate "
-"over."
+"If you don't want to use Augeas (you fool!) then try calling "
+"L</guestfs_read_lines> to get the file as a list of lines which you can "
+"iterate over."
 msgstr ""
 
 #. type: =head2
@@ -36526,16 +36347,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:525
 msgid ""
-"The default umask is C<022>, so files are created with modes such as C<0644> "
-"and directories with C<0755>."
+"The default umask is C<022>, so files are created with modes such as C<0644>"
+" and directories with C<0755>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:528
 msgid ""
 "There are two ways to avoid being affected by umask.  Either set umask to 0 "
-"(call C<guestfs_umask (g, 0)> early after launching).  Or call L</"
-"guestfs_chmod> after creating each file or directory."
+"(call C<guestfs_umask (g, 0)> early after launching).  Or call "
+"L</guestfs_chmod> after creating each file or directory."
 msgstr ""
 
 #. type: textblock
@@ -36546,8 +36367,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:536
 msgid ""
-"Libguestfs allows you to access Linux guests which have been encrypted using "
-"whole disk encryption that conforms to the Linux Unified Key Setup (LUKS) "
+"Libguestfs allows you to access Linux guests which have been encrypted using"
+" whole disk encryption that conforms to the Linux Unified Key Setup (LUKS) "
 "standard.  This includes nearly all whole disk encryption systems used by "
 "modern Linux guests."
 msgstr ""
@@ -36569,27 +36390,27 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:548
 msgid ""
-"Opening a LUKS device creates a new device mapper device called C</dev/"
-"mapper/mapname> (where C<mapname> is the string you supply to L</"
-"guestfs_luks_open>).  Reads and writes to this mapper device are decrypted "
-"from and encrypted to the underlying block device respectively."
+"Opening a LUKS device creates a new device mapper device called "
+"C</dev/mapper/mapname> (where C<mapname> is the string you supply to "
+"L</guestfs_luks_open>).  Reads and writes to this mapper device are "
+"decrypted from and encrypted to the underlying block device respectively."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:554
 msgid ""
-"LVM volume groups on the device can be made visible by calling L</"
-"guestfs_vgscan> followed by L</guestfs_vg_activate_all>.  The logical volume"
-"(s) can now be mounted in the usual way."
+"LVM volume groups on the device can be made visible by calling "
+"L</guestfs_vgscan> followed by L</guestfs_vg_activate_all>.  The logical "
+"volume(s) can now be mounted in the usual way."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:558
 msgid ""
-"Use the reverse process to close a LUKS device.  Unmount any logical volumes "
-"on it, deactivate the volume groups by caling C<guestfs_vg_activate (g, 0, "
-"[\"/dev/VG\"])>.  Then close the mapper device by calling L</"
-"guestfs_luks_close> on the C</dev/mapper/mapname> device (I<not> the "
+"Use the reverse process to close a LUKS device.  Unmount any logical volumes"
+" on it, deactivate the volume groups by caling C<guestfs_vg_activate (g, 0, "
+"[\"/dev/VG\"])>.  Then close the mapper device by calling "
+"L</guestfs_luks_close> on the C</dev/mapper/mapname> device (I<not> the "
 "underlying encrypted block device)."
 msgstr ""
 
@@ -36602,24 +36423,24 @@ msgstr "ПЕРЕВІРКА"
 #: ../src/guestfs.pod:567
 msgid ""
 "Libguestfs has APIs for inspecting an unknown disk image to find out if it "
-"contains operating systems, an install CD or a live CD.  (These APIs used to "
-"be in a separate Perl-only library called L<Sys::Guestfs::Lib(3)> but since "
-"version 1.5.3 the most frequently used part of this library has been "
+"contains operating systems, an install CD or a live CD.  (These APIs used to"
+" be in a separate Perl-only library called L<Sys::Guestfs::Lib(3)> but since"
+" version 1.5.3 the most frequently used part of this library has been "
 "rewritten in C and moved into the core code)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:574
 msgid ""
-"Add all disks belonging to the unknown virtual machine and call L</"
-"guestfs_launch> in the usual way."
+"Add all disks belonging to the unknown virtual machine and call "
+"L</guestfs_launch> in the usual way."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:577
 msgid ""
-"Then call L</guestfs_inspect_os>.  This function uses other libguestfs calls "
-"and certain heuristics, and returns a list of operating systems that were "
+"Then call L</guestfs_inspect_os>.  This function uses other libguestfs calls"
+" and certain heuristics, and returns a list of operating systems that were "
 "found.  An empty list means none were found.  A single element is the root "
 "filesystem of the operating system.  For dual- or multi-boot guests, "
 "multiple roots can be returned, each one corresponding to a separate "
@@ -36632,9 +36453,9 @@ msgstr ""
 #: ../src/guestfs.pod:586
 msgid ""
 "For each root, you can then call various C<guestfs_inspect_get_*> functions "
-"to get additional details about that operating system.  For example, call L</"
-"guestfs_inspect_get_type> to return the string C<windows> or C<linux> for "
-"Windows and Linux-based operating systems respectively."
+"to get additional details about that operating system.  For example, call "
+"L</guestfs_inspect_get_type> to return the string C<windows> or C<linux> for"
+" Windows and Linux-based operating systems respectively."
 msgstr ""
 
 #. type: textblock
@@ -36642,8 +36463,8 @@ msgstr ""
 msgid ""
 "Un*x-like and Linux-based operating systems usually consist of several "
 "filesystems which are mounted at boot time (for example, a separate boot "
-"partition mounted on C</boot>).  The inspection rules are able to detect how "
-"filesystems correspond to mount points.  Call "
+"partition mounted on C</boot>).  The inspection rules are able to detect how"
+" filesystems correspond to mount points.  Call "
 "C<guestfs_inspect_get_mountpoints> to get this mapping.  It might return a "
 "hash table like this example:"
 msgstr ""
@@ -36672,16 +36493,17 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:606
 msgid ""
-"Be careful to mount filesystems in the right order (eg. C</> before C</"
-"usr>).  Sorting the keys of the hash by length, shortest first, should work."
+"Be careful to mount filesystems in the right order (eg. C</> before "
+"C</usr>).  Sorting the keys of the hash by length, shortest first, should "
+"work."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:610
 msgid ""
 "Inspection currently only works for some common operating systems.  "
-"Contributors are welcome to send patches for other operating systems that we "
-"currently cannot detect."
+"Contributors are welcome to send patches for other operating systems that we"
+" currently cannot detect."
 msgstr ""
 
 #. type: textblock
@@ -36699,10 +36521,10 @@ msgid ""
 "inspection and caches the results in the guest handle.  Subsequent calls to "
 "C<guestfs_inspect_get_*> return this cached information, but I<do not> re-"
 "read the disks.  If you change the content of the guest disks, you can redo "
-"inspection by calling L</guestfs_inspect_os> again.  (L</"
-"guestfs_inspect_list_applications> works a little differently from the other "
-"calls and does read the disks.  See documentation for that function for "
-"details)."
+"inspection by calling L</guestfs_inspect_os> again.  "
+"(L</guestfs_inspect_list_applications> works a little differently from the "
+"other calls and does read the disks.  See documentation for that function "
+"for details)."
 msgstr ""
 
 #. type: =head3
@@ -36729,16 +36551,17 @@ msgstr ""
 #: ../src/guestfs.pod:636
 msgid ""
 "Further information is available about the operating system that can be "
-"installed using the regular inspection APIs like L</"
-"guestfs_inspect_get_product_name>, L</guestfs_inspect_get_major_version> etc."
+"installed using the regular inspection APIs like "
+"L</guestfs_inspect_get_product_name>, L</guestfs_inspect_get_major_version> "
+"etc."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:641
 msgid ""
 "Some additional information specific to installer disks is also available "
-"from the L</guestfs_inspect_is_live>, L</guestfs_inspect_is_netinst> and L</"
-"guestfs_inspect_is_multipart> calls."
+"from the L</guestfs_inspect_is_live>, L</guestfs_inspect_is_netinst> and "
+"L</guestfs_inspect_is_multipart> calls."
 msgstr ""
 
 #. type: =head2
@@ -36749,8 +36572,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:648
 msgid ""
-"Libguestfs can mount NTFS partitions.  It does this using the L<http://www."
-"ntfs-3g.org/> driver."
+"Libguestfs can mount NTFS partitions.  It does this using the L<http://www"
+".ntfs-3g.org/> driver."
 msgstr ""
 
 #. type: =head3
@@ -36763,9 +36586,9 @@ msgstr "ЛІТЕРИ ДИСКІВ ТА ШЛЯХИ"
 msgid ""
 "DOS and Windows still use drive letters, and the filesystems are always "
 "treated as case insensitive by Windows itself, and therefore you might find "
-"a Windows configuration file referring to a path like C<c:\\windows"
-"\\system32>.  When the filesystem is mounted in libguestfs, that directory "
-"might be referred to as C</WINDOWS/System32>."
+"a Windows configuration file referring to a path like "
+"C<c:\\windows\\system32>.  When the filesystem is mounted in libguestfs, "
+"that directory might be referred to as C</WINDOWS/System32>."
 msgstr ""
 
 #. type: textblock
@@ -36786,8 +36609,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:666
 msgid ""
-"To resolve the case insensitivity of paths, call L</"
-"guestfs_case_sensitive_path>."
+"To resolve the case insensitivity of paths, call "
+"L</guestfs_case_sensitive_path>."
 msgstr ""
 
 #. type: =head3
@@ -36802,8 +36625,8 @@ msgid ""
 "files, through the library C<hivex> which is part of the libguestfs project "
 "although ships as a separate tarball.  You have to locate and download the "
 "hive file(s) yourself, and then pass them to C<hivex> functions.  See also "
-"the programs L<hivexml(1)>, L<hivexsh(1)>, L<hivexregedit(1)> and L<virt-win-"
-"reg(1)> for more help on this issue."
+"the programs L<hivexml(1)>, L<hivexsh(1)>, L<hivexregedit(1)> and L<virt-"
+"win-reg(1)> for more help on this issue."
 msgstr ""
 
 #. type: =head3
@@ -36841,8 +36664,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:694
 msgid ""
-"Instead if you encounter a symbolic link on an ntfs-3g filesystem, use L</"
-"guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "
+"Instead if you encounter a symbolic link on an ntfs-3g filesystem, use "
+"L</guestfs_lgetxattr> to read the C<system.ntfs_reparse_data> extended "
 "attribute, and read the raw reparse data from that (you can find the format "
 "documented in various places around the web)."
 msgstr ""
@@ -36882,8 +36705,8 @@ msgstr ""
 #: ../src/guestfs.pod:711
 msgid ""
 "The API is broadly identical in all supported languages.  This means that "
-"the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)> "
-"in Perl, C<g.add_drive_ro(file)> in Python, and C<g#add_drive_ro file> in "
+"the C call C<guestfs_add_drive_ro(g,file)> is C<$g-E<gt>add_drive_ro($file)>"
+" in Perl, C<g.add_drive_ro(file)> in Python, and C<g#add_drive_ro file> in "
 "OCaml.  In other words, a straightforward, predictable isomorphism between "
 "each language."
 msgstr ""
@@ -36891,8 +36714,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:717
 msgid ""
-"Error messages are automatically transformed into exceptions if the language "
-"supports it."
+"Error messages are automatically transformed into exceptions if the language"
+" supports it."
 msgstr ""
 
 #. type: textblock
@@ -37047,8 +36870,8 @@ msgstr ""
 msgid ""
 "Since we developed libguestfs and the associated tools, there are several "
 "things we would have designed differently, but are now stuck with for "
-"backwards compatibility or other reasons.  If there is ever a libguestfs 2.0 "
-"release, you can expect these to change.  Beware of them."
+"backwards compatibility or other reasons.  If there is ever a libguestfs 2.0"
+" release, you can expect these to change.  Beware of them."
 msgstr ""
 
 #. type: =item
@@ -37085,7 +36908,8 @@ msgstr ""
 #: ../src/guestfs.pod:806
 msgid ""
 "to have the unmount/sync done automatically for you when the handle 'g' is "
-"closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> q.v.)"
+"closed.  (This feature is called \"autosync\", L</guestfs_set_autosync> "
+"q.v.)"
 msgstr ""
 
 #. type: textblock
@@ -37119,8 +36943,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:823
 msgid ""
-"If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly.  "
-"However C<-o sync> does not add any reliability benefit, but does have a "
+"If you use L</guestfs_mount>, then C<-o sync,noatime> are added implicitly."
+"  However C<-o sync> does not add any reliability benefit, but does have a "
 "very large performance impact."
 msgstr ""
 
@@ -37152,8 +36976,8 @@ msgstr ""
 #: ../src/guestfs.pod:837
 msgid ""
 "Note that many filesystems change the disk when you just mount and unmount, "
-"even if you didn't perform any writes.  You need to use L</"
-"guestfs_add_drive_ro> to guarantee that the disk is not changed."
+"even if you didn't perform any writes.  You need to use "
+"L</guestfs_add_drive_ro> to guarantee that the disk is not changed."
 msgstr ""
 
 #. type: =item
@@ -37165,10 +36989,10 @@ msgstr ""
 #: ../src/guestfs.pod:843
 msgid ""
 "C<guestfish disk.img> doesn't do what people expect (open C<disk.img> for "
-"examination).  It tries to run a guestfish command C<disk.img> which doesn't "
-"exist, so it fails.  In earlier versions of guestfish the error message was "
-"also unintuitive, but we have corrected this since.  Like the Bourne shell, "
-"we should have used C<guestfish -c command> to run commands."
+"examination).  It tries to run a guestfish command C<disk.img> which doesn't"
+" exist, so it fails.  In earlier versions of guestfish the error message was"
+" also unintuitive, but we have corrected this since.  Like the Bourne shell,"
+" we should have used C<guestfish -c command> to run commands."
 msgstr ""
 
 #. type: =item
@@ -37225,9 +37049,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:873
 msgid ""
-"There is a subtle ambiguity in the API between a device name (eg. C</dev/"
-"sdb2>) and a similar pathname.  A file might just happen to be called "
-"C<sdb2> in the directory C</dev> (consider some non-Unix VM image)."
+"There is a subtle ambiguity in the API between a device name (eg. "
+"C</dev/sdb2>) and a similar pathname.  A file might just happen to be called"
+" C<sdb2> in the directory C</dev> (consider some non-Unix VM image)."
 msgstr ""
 
 #. type: textblock
@@ -37305,8 +37129,8 @@ msgstr ""
 #: ../src/guestfs.pod:914
 msgid ""
 "Therefore you should be aware that any key parameter you pass to libguestfs "
-"might end up being written out to the swap partition.  If this is a concern, "
-"scrub the swap partition or don't use libguestfs on encrypted devices."
+"might end up being written out to the swap partition.  If this is a concern,"
+" scrub the swap partition or don't use libguestfs on encrypted devices."
 msgstr ""
 
 #. type: =head2
@@ -37324,9 +37148,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:924
 msgid ""
-"Only use the handle from a single thread.  Either use the handle exclusively "
-"from one thread, or provide your own mutex so that two threads cannot issue "
-"calls on the same handle at the same time."
+"Only use the handle from a single thread.  Either use the handle exclusively"
+" from one thread, or provide your own mutex so that two threads cannot issue"
+" calls on the same handle at the same time."
 msgstr ""
 
 #. type: textblock
@@ -37351,15 +37175,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:936
 msgid ""
-"By default it looks for these in the directory C<$libdir/guestfs> (eg. C</"
-"usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."
+"By default it looks for these in the directory C<$libdir/guestfs> (eg. "
+"C</usr/local/lib/guestfs> or C</usr/lib64/guestfs>)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:939
 msgid ""
-"Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH> "
-"to change the directories that libguestfs will search in.  The value is a "
+"Use L</guestfs_set_path> or set the environment variable L</LIBGUESTFS_PATH>"
+" to change the directories that libguestfs will search in.  The value is a "
 "colon-separated list of paths.  The current directory is I<not> searched "
 "unless the path contains an empty element or C<.>.  For example "
 "C<LIBGUESTFS_PATH=:/usr/lib/guestfs> would search the current directory and "
@@ -37374,8 +37198,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:948
 msgid ""
-"If you want to compile your own qemu, run qemu from a non-standard location, "
-"or pass extra arguments to qemu, then you can write a shell-script wrapper "
+"If you want to compile your own qemu, run qemu from a non-standard location,"
+" or pass extra arguments to qemu, then you can write a shell-script wrapper "
 "around qemu."
 msgstr ""
 
@@ -37391,8 +37215,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:957
 msgid ""
-"Here is an example of a wrapper, where I have built my own copy of qemu from "
-"source:"
+"Here is an example of a wrapper, where I have built my own copy of qemu from"
+" source:"
 msgstr ""
 
 #. type: verbatim
@@ -37438,9 +37262,9 @@ msgstr ""
 #: ../src/guestfs.pod:973
 msgid ""
 "Wrappers can also be used to edit the options passed to qemu.  In the "
-"following example, the C<-machine ...> option (C<-machine> and the following "
-"argument) are removed from the command line and replaced with C<-machine pc,"
-"accel=tcg>.  The while loop iterates over the options until it finds the "
+"following example, the C<-machine ...> option (C<-machine> and the following"
+" argument) are removed from the command line and replaced with C<-machine "
+"pc,accel=tcg>.  The while loop iterates over the options until it finds the "
 "right one to remove, putting the remaining options into the C<args> array."
 msgstr ""
 
@@ -37499,15 +37323,15 @@ msgstr "За допомогою guestfs_set_attach_method"
 #: ../src/guestfs.pod:1007
 msgid ""
 "By calling L</guestfs_set_attach_method> you can change how the library "
-"connects to the C<guestfsd> daemon in L</guestfs_launch> (read L</"
-"ARCHITECTURE> for some background)."
+"connects to the C<guestfsd> daemon in L</guestfs_launch> (read "
+"L</ARCHITECTURE> for some background)."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1011
 msgid ""
-"The normal attach method is C<appliance>, where a small appliance is created "
-"containing the daemon, and then the library connects to this."
+"The normal attach method is C<appliance>, where a small appliance is created"
+" containing the daemon, and then the library connects to this."
 msgstr ""
 
 #. type: textblock
@@ -37603,8 +37427,8 @@ msgid ""
 "We guarantee the libguestfs ABI (binary interface), for public, high-level "
 "actions as outlined in this section.  Although we will deprecate some "
 "actions, for example if they get replaced by newer calls, we will keep the "
-"old actions forever.  This allows you the developer to program in confidence "
-"against the libguestfs API."
+"old actions forever.  This allows you the developer to program in confidence"
+" against the libguestfs API."
 msgstr ""
 
 #. type: =head2
@@ -37617,13 +37441,14 @@ msgstr "ІМЕНУВАННЯ БЛОКОВИХ ПРИСТРОЇВ"
 msgid ""
 "In the kernel there is now quite a profusion of schemata for naming block "
 "devices (in this context, by I<block device> I mean a physical or virtual "
-"hard drive).  The original Linux IDE driver used names starting with C</dev/"
-"hd*>.  SCSI devices have historically used a different naming scheme, C</dev/"
-"sd*>.  When the Linux kernel I<libata> driver became a popular replacement "
-"for the old IDE driver (particularly for SATA devices) those devices also "
-"used the C</dev/sd*> scheme.  Additionally we now have virtual machines with "
-"paravirtualized drivers.  This has created several different naming systems, "
-"such as C</dev/vd*> for virtio disks and C</dev/xvd*> for Xen PV disks."
+"hard drive).  The original Linux IDE driver used names starting with "
+"C</dev/hd*>.  SCSI devices have historically used a different naming scheme,"
+" C</dev/sd*>.  When the Linux kernel I<libata> driver became a popular "
+"replacement for the old IDE driver (particularly for SATA devices) those "
+"devices also used the C</dev/sd*> scheme.  Additionally we now have virtual "
+"machines with paravirtualized drivers.  This has created several different "
+"naming systems, such as C</dev/vd*> for virtio disks and C</dev/xvd*> for "
+"Xen PV disks."
 msgstr ""
 
 #. type: textblock
@@ -37646,16 +37471,16 @@ msgstr ""
 #: ../src/guestfs.pod:1084
 msgid ""
 "Therefore libguestfs defines C</dev/sd*> as the I<standard naming scheme>.  "
-"Internally C</dev/sd*> names are translated, if necessary, to other names as "
-"required.  For example, under RHEL 5 which uses the C</dev/hd*> scheme, any "
-"device parameter C</dev/sda2> is translated to C</dev/hda2> transparently."
+"Internally C</dev/sd*> names are translated, if necessary, to other names as"
+" required.  For example, under RHEL 5 which uses the C</dev/hd*> scheme, any"
+" device parameter C</dev/sda2> is translated to C</dev/hda2> transparently."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1090
 msgid ""
-"Note that this I<only> applies to parameters.  The L</guestfs_list_devices>, "
-"L</guestfs_list_partitions> and similar calls return the true names of the "
+"Note that this I<only> applies to parameters.  The L</guestfs_list_devices>,"
+" L</guestfs_list_partitions> and similar calls return the true names of the "
 "devices and partitions as known to the appliance."
 msgstr ""
 
@@ -37667,9 +37492,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1097
 msgid ""
-"Usually this translation is transparent.  However in some (very rare)  cases "
-"you may need to know the exact algorithm.  Such cases include where you use "
-"L</guestfs_config> to add a mixture of virtio and IDE devices to the qemu-"
+"Usually this translation is transparent.  However in some (very rare)  cases"
+" you may need to know the exact algorithm.  Such cases include where you use"
+" L</guestfs_config> to add a mixture of virtio and IDE devices to the qemu-"
 "based appliance, so have a mixture of C</dev/sd*> and C</dev/vd*> devices."
 msgstr ""
 
@@ -37677,8 +37502,8 @@ msgstr ""
 #: ../src/guestfs.pod:1103
 msgid ""
 "The algorithm is applied only to I<parameters> which are known to be either "
-"device or partition names.  Return values from functions such as L</"
-"guestfs_list_devices> are never changed."
+"device or partition names.  Return values from functions such as "
+"L</guestfs_list_devices> are never changed."
 msgstr ""
 
 #. type: textblock
@@ -37732,8 +37557,8 @@ msgstr ""
 #: ../src/guestfs.pod:1140
 msgid ""
 "Although the standard naming scheme and automatic translation is useful for "
-"simple programs and guestfish scripts, for larger programs it is best not to "
-"rely on this mechanism."
+"simple programs and guestfish scripts, for larger programs it is best not to"
+" rely on this mechanism."
 msgstr ""
 
 #. type: textblock
@@ -37865,10 +37690,10 @@ msgstr "ЗАХИСТ ПРОТОКОЛУ"
 #. type: textblock
 #: ../src/guestfs.pod:1236
 msgid ""
-"The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a "
-"defined upper message size.  However a program that uses libguestfs must "
-"also take care - for example you can write a program that downloads a binary "
-"from a disk image and executes it locally, and no amount of protocol "
+"The protocol is designed to be secure, being based on RFC 4506 (XDR)  with a"
+" defined upper message size.  However a program that uses libguestfs must "
+"also take care - for example you can write a program that downloads a binary"
+" from a disk image and executes it locally, and no amount of protocol "
 "security will save you from the consequences."
 msgstr ""
 
@@ -37890,8 +37715,8 @@ msgstr ""
 #: ../src/guestfs.pod:1250
 msgid ""
 "Guest configuration may be altered in unusual ways by the administrator of "
-"the virtual machine, and may not reflect reality (particularly for untrusted "
-"or actively malicious guests).  For example we parse the hostname from "
+"the virtual machine, and may not reflect reality (particularly for untrusted"
+" or actively malicious guests).  For example we parse the hostname from "
 "configuration files like C</etc/sysconfig/network> that we find in the "
 "guest, but the guest administrator can easily manipulate these files to "
 "provide the wrong hostname."
@@ -37903,8 +37728,8 @@ msgid ""
 "The inspection API parses guest configuration using two external libraries: "
 "Augeas (Linux configuration) and hivex (Windows Registry).  Both are "
 "designed to be robust in the face of malicious data, although denial of "
-"service attacks are still possible, for example with oversized configuration "
-"files."
+"service attacks are still possible, for example with oversized configuration"
+" files."
 msgstr ""
 
 #. type: =head2
@@ -37943,8 +37768,8 @@ msgstr ""
 #: ../src/guestfs.pod:1279
 msgid ""
 "A raw disk image is just the raw bytes, there is no header.  Other disk "
-"images like qcow2 contain a special header.  Qemu deals with this by looking "
-"for one of the known headers, and if none is found then assuming the disk "
+"images like qcow2 contain a special header.  Qemu deals with this by looking"
+" for one of the known headers, and if none is found then assuming the disk "
 "image must be raw."
 msgstr ""
 
@@ -37953,8 +37778,8 @@ msgstr ""
 msgid ""
 "This allows a guest which has been given a raw disk image to write some "
 "other header.  At next boot (or when the disk image is accessed by "
-"libguestfs) qemu would do autodetection and think the disk image format was, "
-"say, qcow2 based on the header written by the guest."
+"libguestfs) qemu would do autodetection and think the disk image format was,"
+" say, qcow2 based on the header written by the guest."
 msgstr ""
 
 #. type: textblock
@@ -38031,8 +37856,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1332
 msgid ""
-"For information on using multiple handles and threads, see the section L</"
-"MULTIPLE HANDLES AND MULTIPLE THREADS> above."
+"For information on using multiple handles and threads, see the section "
+"L</MULTIPLE HANDLES AND MULTIPLE THREADS> above."
 msgstr ""
 
 #. type: =head2
@@ -38058,8 +37883,8 @@ msgstr "Створити дескриптор з’єднання."
 #. type: textblock
 #: ../src/guestfs.pod:1341
 msgid ""
-"On success this returns a non-NULL pointer to a handle.  On error it returns "
-"NULL."
+"On success this returns a non-NULL pointer to a handle.  On error it returns"
+" NULL."
 msgstr ""
 
 #. type: textblock
@@ -38078,8 +37903,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1350
 msgid ""
-"You may also want to configure error handling for the handle.  See the L</"
-"ERROR HANDLING> section below."
+"You may also want to configure error handling for the handle.  See the "
+"L</ERROR HANDLING> section below."
 msgstr ""
 
 #. type: =head2
@@ -38106,8 +37931,8 @@ msgstr ""
 #: ../src/guestfs.pod:1359
 msgid ""
 "If autosync was set on the handle and the handle was launched, then this "
-"implicitly calls various functions to unmount filesystems and sync the "
-"disk.  See L</guestfs_set_autosync> for more details."
+"implicitly calls various functions to unmount filesystems and sync the disk."
+"  See L</guestfs_set_autosync> for more details."
 msgstr ""
 
 #. type: textblock
@@ -38138,9 +37963,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1374
 msgid ""
-"You can get at the additional information about the last error on the handle "
-"by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by setting "
-"up an error handler with L</guestfs_set_error_handler>."
+"You can get at the additional information about the last error on the handle"
+" by calling L</guestfs_last_error>, L</guestfs_last_errno>, and/or by "
+"setting up an error handler with L</guestfs_set_error_handler>."
 msgstr ""
 
 #. type: textblock
@@ -38207,19 +38032,19 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1407
 msgid ""
-"Out of memory errors are handled differently.  The default action is to call "
-"L<abort(3)>.  If this is undesirable, then you can set a handler using L</"
-"guestfs_set_out_of_memory_handler>."
+"Out of memory errors are handled differently.  The default action is to call"
+" L<abort(3)>.  If this is undesirable, then you can set a handler using "
+"L</guestfs_set_out_of_memory_handler>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1411
 msgid ""
 "L</guestfs_create> returns C<NULL> if the handle cannot be created, and "
-"because there is no handle if this happens there is no way to get additional "
-"error information.  However L</guestfs_create> is supposed to be a "
-"lightweight operation which can only fail because of insufficient memory (it "
-"returns NULL in this case)."
+"because there is no handle if this happens there is no way to get additional"
+" error information.  However L</guestfs_create> is supposed to be a "
+"lightweight operation which can only fail because of insufficient memory (it"
+" returns NULL in this case)."
 msgstr ""
 
 #. type: =head2
@@ -38240,15 +38065,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1421
 msgid ""
-"This returns the last error message that happened on C<g>.  If there has not "
-"been an error since the handle was created, then this returns C<NULL>."
+"This returns the last error message that happened on C<g>.  If there has not"
+" been an error since the handle was created, then this returns C<NULL>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1425
 msgid ""
-"The lifetime of the returned string is until the next error occurs, or L</"
-"guestfs_close> is called."
+"The lifetime of the returned string is until the next error occurs, or "
+"L</guestfs_close> is called."
 msgstr ""
 
 #. type: =head2
@@ -38308,8 +38133,8 @@ msgid ""
 "Libguestfs tries to convert the errno from inside the applicance into a "
 "corresponding errno for the caller (not entirely trivial: the appliance "
 "might be running a completely different operating system from the library "
-"and error numbers are not standardized across Un*xen).  If this could not be "
-"done, then the error is translated to C<EINVAL>.  In practice this should "
+"and error numbers are not standardized across Un*xen).  If this could not be"
+" done, then the error is translated to C<EINVAL>.  In practice this should "
 "only happen in very rare circumstances."
 msgstr ""
 
@@ -38493,8 +38318,8 @@ msgstr ""
 #: ../src/guestfs.pod:1539
 msgid ""
 "In L<guestfish(3)> there is a handy interactive command C<supported> which "
-"prints out the available groups and whether they are supported by this build "
-"of libguestfs.  Note however that you have to do C<run> first."
+"prints out the available groups and whether they are supported by this build"
+" of libguestfs.  Note however that you have to do C<run> first."
 msgstr ""
 
 #. type: =head2
@@ -38528,8 +38353,8 @@ msgstr ""
 #: ../src/guestfs.pod:1553
 msgid ""
 "Before version 1.5.8, if you needed to test whether a single libguestfs "
-"function is available at compile time, we recommended using build tools such "
-"as autoconf or cmake.  For example in autotools you could use:"
+"function is available at compile time, we recommended using build tools such"
+" as autoconf or cmake.  For example in autotools you could use:"
 msgstr ""
 
 #. type: verbatim
@@ -38547,8 +38372,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1561
 msgid ""
-"which would result in C<HAVE_GUESTFS_DD> being either defined or not defined "
-"in your program."
+"which would result in C<HAVE_GUESTFS_DD> being either defined or not defined"
+" in your program."
 msgstr ""
 
 #. type: =head2
@@ -38668,9 +38493,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1620
 msgid ""
-"A recent feature of the API is the introduction of calls which take optional "
-"arguments.  In C these are declared 3 ways.  The main way is as a call which "
-"takes variable arguments (ie. C<...>), as in this example:"
+"A recent feature of the API is the introduction of calls which take optional"
+" arguments.  In C these are declared 3 ways.  The main way is as a call "
+"which takes variable arguments (ie. C<...>), as in this example:"
 msgstr ""
 
 #. type: verbatim
@@ -38755,8 +38580,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1650
 msgid ""
-"The second variant has the same name with the suffix C<_va>, which works the "
-"same way but takes a C<va_list>.  See the C manual for details.  For the "
+"The second variant has the same name with the suffix C<_va>, which works the"
+" same way but takes a C<va_list>.  See the C manual for details.  For the "
 "example function, this is declared:"
 msgstr ""
 
@@ -38848,7 +38673,8 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1691
-msgid "The C<_BITMASK> suffix on each option name when specifying the bitmask."
+msgid ""
+"The C<_BITMASK> suffix on each option name when specifying the bitmask."
 msgstr ""
 
 #. type: textblock
@@ -38913,10 +38739,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1732
 msgid ""
-"In the current implementation, events are only generated synchronously: that "
-"means that events (and hence callbacks) can only happen while you are in the "
-"middle of making another libguestfs call.  The callback is called in the "
-"same thread."
+"In the current implementation, events are only generated synchronously: that"
+" means that events (and hence callbacks) can only happen while you are in "
+"the middle of making another libguestfs call.  The callback is called in the"
+" same thread."
 msgstr ""
 
 #. type: textblock
@@ -38947,8 +38773,8 @@ msgstr ""
 #: ../src/guestfs.pod:1751
 msgid ""
 "Note that libguestfs installs an L<atexit(3)> handler to try to clean up "
-"handles that are open when the program exits.  This means that this callback "
-"might be called indirectly from L<exit(3)>, which can cause unexpected "
+"handles that are open when the program exits.  This means that this callback"
+" might be called indirectly from L<exit(3)>, which can cause unexpected "
 "problems in higher-level languages (eg. if your HLL interpreter has already "
 "been cleaned up by the time this is called, and if your callback then jumps "
 "into some HLL function)."
@@ -39017,9 +38843,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1791
 msgid ""
-"The units of C<total> are not defined, although for some operations C<total> "
-"may relate in some way to the amount of data to be transferred (eg. in bytes "
-"or megabytes), and C<position> may be the portion which has been transferred."
+"The units of C<total> are not defined, although for some operations C<total>"
+" may relate in some way to the amount of data to be transferred (eg. in "
+"bytes or megabytes), and C<position> may be the portion which has been "
+"transferred."
 msgstr ""
 
 #. type: textblock
@@ -39051,16 +38878,16 @@ msgstr ""
 #: ../src/guestfs.pod:1815
 msgid ""
 "This is to simplify caller code, so callers can easily set the progress "
-"indicator to \"100%\" at the end of the operation, without requiring special "
-"code to detect this case."
+"indicator to \"100%\" at the end of the operation, without requiring special"
+" code to detect this case."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1821
 msgid ""
 "For some calls we are unable to estimate the progress of the call, but we "
-"can still generate progress messages to indicate activity.  This is known as "
-"\"pulse mode\", and is directly supported by certain progress bar "
+"can still generate progress messages to indicate activity.  This is known as"
+" \"pulse mode\", and is directly supported by certain progress bar "
 "implementations (eg. GtkProgressBar)."
 msgstr ""
 
@@ -39101,15 +38928,15 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1846
 msgid ""
-"The callback function is called whenever a log message is generated by qemu, "
-"the appliance kernel, guestfsd (daemon), or utility programs."
+"The callback function is called whenever a log message is generated by qemu,"
+" the appliance kernel, guestfsd (daemon), or utility programs."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:1849
 msgid ""
-"If the verbose flag (L</guestfs_set_verbose>) is set before launch (L</"
-"guestfs_launch>) then additional debug messages are generated."
+"If the verbose flag (L</guestfs_set_verbose>) is set before launch "
+"(L</guestfs_launch>) then additional debug messages are generated."
 msgstr ""
 
 #. type: textblock
@@ -39147,8 +38974,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1874
 msgid ""
-"The callback function is called whenever a trace message is generated.  This "
-"only applies if the trace flag (L</guestfs_set_trace>) is set."
+"The callback function is called whenever a trace message is generated.  This"
+" only applies if the trace flag (L</guestfs_set_trace>) is set."
 msgstr ""
 
 #. type: textblock
@@ -39212,8 +39039,8 @@ msgstr ""
 #: ../src/guestfs.pod:1909
 msgid ""
 "For example, to register for all log message events, you could call this "
-"function with the bitmask C<GUESTFS_EVENT_APPLIANCE|GUESTFS_EVENT_LIBRARY>.  "
-"To register a single callback for all possible classes of events, use "
+"function with the bitmask C<GUESTFS_EVENT_APPLIANCE|GUESTFS_EVENT_LIBRARY>."
+"  To register a single callback for all possible classes of events, use "
 "C<GUESTFS_EVENT_ALL>."
 msgstr ""
 
@@ -39225,8 +39052,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1917
 msgid ""
-"C<opaque> is an opaque pointer which is passed to the callback.  You can use "
-"it for any purpose."
+"C<opaque> is an opaque pointer which is passed to the callback.  You can use"
+" it for any purpose."
 msgstr ""
 
 #. type: textblock
@@ -39239,8 +39066,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1923
 msgid ""
-"If there is an error, this function returns C<-1>, and sets the error in the "
-"handle in the usual way (see L</guestfs_last_error> etc.)"
+"If there is an error, this function returns C<-1>, and sets the error in the"
+" handle in the usual way (see L</guestfs_last_error> etc.)"
 msgstr ""
 
 #. type: textblock
@@ -39274,8 +39101,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1937
 msgid ""
-"Delete a callback that was previously registered.  C<event_handle> should be "
-"the integer that was returned by a previous call to "
+"Delete a callback that was previously registered.  C<event_handle> should be"
+" the integer that was returned by a previous call to "
 "C<guestfs_set_event_callback> on the same handle."
 msgstr ""
 
@@ -39316,9 +39143,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:1959
 msgid ""
-"The remaining parameters contain the event payload (if any).  Each event may "
-"contain a payload, which usually relates to the event class, but for future "
-"proofing your code should be written to handle any payload for any event "
+"The remaining parameters contain the event payload (if any).  Each event may"
+" contain a payload, which usually relates to the event class, but for future"
+" proofing your code should be written to handle any payload for any event "
 "class."
 msgstr ""
 
@@ -39446,17 +39273,17 @@ msgstr ""
 #: ../src/guestfs.pod:2027
 msgid ""
 "Unlike most other libguestfs calls, this function is signal safe and thread "
-"safe.  You can call it from a signal handler or from another thread, without "
-"needing to do any locking."
+"safe.  You can call it from a signal handler or from another thread, without"
+" needing to do any locking."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2031
 msgid ""
 "The transfer that was in progress (if there is one) will stop shortly "
-"afterwards, and will return an error.  The errno (see L</"
-"guestfs_last_errno>) is set to C<EINTR>, so you can test for this to find "
-"out if the operation was cancelled or failed because of another error."
+"afterwards, and will return an error.  The errno (see "
+"L</guestfs_last_errno>) is set to C<EINTR>, so you can test for this to find"
+" out if the operation was cancelled or failed because of another error."
 msgstr ""
 
 #. type: textblock
@@ -39469,7 +39296,8 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2041
-msgid "There are two common places that you might call C<guestfs_user_cancel>."
+msgid ""
+"There are two common places that you might call C<guestfs_user_cancel>."
 msgstr ""
 
 #. type: textblock
@@ -39592,8 +39420,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2094
 msgid ""
-"C<guestfs_first_private> returns the first key, pointer pair (\"first\" does "
-"not have any particular meaning -- keys are not returned in any defined "
+"C<guestfs_first_private> returns the first key, pointer pair (\"first\" does"
+" not have any particular meaning -- keys are not returned in any defined "
 "order).  A pointer to the key is returned in C<*key_rtn> and the "
 "corresponding data pointer is returned from the function.  C<NULL> is "
 "returned if there are no keys stored in the handle."
@@ -39675,8 +39503,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2146
 msgid ""
-"More commonly you are only interested in keys that begin with an application-"
-"specific prefix C<foo_>.  Modify the loop like so:"
+"More commonly you are only interested in keys that begin with an "
+"application-specific prefix C<foo_>.  Modify the loop like so:"
 msgstr ""
 
 #. type: verbatim
@@ -39775,8 +39603,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2199
 msgid ""
-"This script contains examples of displaying both the static markers and some "
-"ordinary C entry points:"
+"This script contains examples of displaying both the static markers and some"
+" ordinary C entry points:"
 msgstr ""
 
 #. type: verbatim
@@ -39895,11 +39723,11 @@ msgstr "html"
 #. type: textblock
 #: ../src/guestfs.pod:2256
 msgid ""
-"<!-- old anchor for the next section --> <a name="
-"\"state_machine_and_low_level_event_api\"/>"
+"<!-- old anchor for the next section --> <a "
+"name=\"state_machine_and_low_level_event_api\"/>"
 msgstr ""
-"<!-- old anchor for the next section --> <a name="
-"\"state_machine_and_low_level_event_api\"/>"
+"<!-- old anchor for the next section --> <a "
+"name=\"state_machine_and_low_level_event_api\"/>"
 
 #. type: =head1
 #: ../src/guestfs.pod:2261
@@ -39943,8 +39771,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2287
 msgid ""
-"The library, linked to the main program, creates the child process and hence "
-"the appliance in the L</guestfs_launch> function."
+"The library, linked to the main program, creates the child process and hence"
+" the appliance in the L</guestfs_launch> function."
 msgstr ""
 
 #. type: textblock
@@ -39953,8 +39781,8 @@ msgid ""
 "Inside the appliance is a Linux kernel and a complete stack of userspace "
 "tools (such as LVM and ext2 programs) and a small controlling daemon called "
 "L</guestfsd>.  The library talks to L</guestfsd> using remote procedure "
-"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs "
-"API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
+"calls (RPC).  There is a mostly one-to-one correspondence between libguestfs"
+" API calls and RPC calls to the daemon.  Lastly the disk image(s) are "
 "attached to the qemu process which translates device access by the "
 "appliance's Linux kernel into accesses to the image."
 msgstr ""
@@ -39962,8 +39790,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2299
 msgid ""
-"A common misunderstanding is that the appliance \"is\" the virtual machine.  "
-"Although the disk image you are attached to might also be used by some "
+"A common misunderstanding is that the appliance \"is\" the virtual machine."
+"  Although the disk image you are attached to might also be used by some "
 "virtual machine, libguestfs doesn't know or care about this.  (But you will "
 "care if both libguestfs's qemu process and your virtual machine are trying "
 "to update the disk image at the same time, since these usually results in "
@@ -40011,9 +39839,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2332
 msgid ""
-"The normal transitions are (1) CONFIG (when the handle is created, but there "
-"is no child process), (2) LAUNCHING (when the child process is booting up), "
-"(3) alternating between READY and BUSY as commands are issued to, and "
+"The normal transitions are (1) CONFIG (when the handle is created, but there"
+" is no child process), (2) LAUNCHING (when the child process is booting up),"
+" (3) alternating between READY and BUSY as commands are issued to, and "
 "carried out by, the child process."
 msgstr ""
 
@@ -40021,8 +39849,8 @@ msgstr ""
 #: ../src/guestfs.pod:2337
 msgid ""
 "The guest may be killed by L</guestfs_kill_subprocess>, or may die "
-"asynchronously at any time (eg. due to some internal error), and that causes "
-"the state to transition back to CONFIG."
+"asynchronously at any time (eg. due to some internal error), and that causes"
+" the state to transition back to CONFIG."
 msgstr ""
 
 #. type: textblock
@@ -40045,8 +39873,8 @@ msgstr ""
 #: ../src/guestfs.pod:2350
 msgid ""
 "API actions such as L</guestfs_mount> can only be issued when in the READY "
-"state.  These API calls block waiting for the command to be carried out (ie. "
-"the state to transition to BUSY and then back to READY).  There are no non-"
+"state.  These API calls block waiting for the command to be carried out (ie."
+" the state to transition to BUSY and then back to READY).  There are no non-"
 "blocking versions, and no way to issue more than one command per handle at "
 "the same time."
 msgstr ""
@@ -40099,8 +39927,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2378
 msgid ""
-"The appliance is cached in C</var/tmp/.guestfs-E<lt>UIDE<gt>> (or in another "
-"directory if C<TMPDIR> is set)."
+"The appliance is cached in C</var/tmp/.guestfs-E<lt>UIDE<gt>> (or in another"
+" directory if C<TMPDIR> is set)."
 msgstr ""
 
 #. type: textblock
@@ -40128,16 +39956,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2391
 msgid ""
-"C<febootstrap-supermin-helper> builds a small initrd.  The initrd is not the "
-"appliance.  The purpose of the initrd is to load enough kernel modules in "
+"C<febootstrap-supermin-helper> builds a small initrd.  The initrd is not the"
+" appliance.  The purpose of the initrd is to load enough kernel modules in "
 "order that the appliance itself can be mounted and started."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:2395
 msgid ""
-"The initrd is a cpio archive called C</var/tmp/.guestfs-E<lt>UIDE<gt>/"
-"initrd>."
+"The initrd is a cpio archive called "
+"C</var/tmp/.guestfs-E<lt>UIDE<gt>/initrd>."
 msgstr ""
 
 #. type: textblock
@@ -40224,8 +40052,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2435
 msgid ""
-"The appliance itself now initializes itself.  This involves starting certain "
-"processes like C<udev>, possibly printing some debug information, and "
+"The appliance itself now initializes itself.  This involves starting certain"
+" processes like C<udev>, possibly printing some debug information, and "
 "finally running the daemon (C<guestfsd>)."
 msgstr ""
 
@@ -40259,8 +40087,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2449
 msgid ""
-"The daemon connects to this port (and hence to the library) and sends a four "
-"byte message C<GUESTFS_LAUNCH_FLAG>, which initiates the communication "
+"The daemon connects to this port (and hence to the library) and sends a four"
+" byte message C<GUESTFS_LAUNCH_FLAG>, which initiates the communication "
 "protocol (see below)."
 msgstr ""
 
@@ -40297,8 +40125,8 @@ msgid ""
 "There are two broad cases, ordinary functions that don't have any C<FileIn> "
 "and C<FileOut> parameters, which are handled with very simple request/reply "
 "messages.  Then there are functions that have any C<FileIn> or C<FileOut> "
-"parameters, which use the same request and reply messages, but they may also "
-"be followed by files sent using a chunked encoding."
+"parameters, which use the same request and reply messages, but they may also"
+" be followed by files sent using a chunked encoding."
 msgstr ""
 
 #. type: =head3
@@ -40326,9 +40154,9 @@ msgstr ""
 #: ../src/guestfs.pod:2483
 msgid ""
 "The total length field allows the daemon to allocate a fixed size buffer "
-"into which it slurps the rest of the message.  As a result, the total length "
-"is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the "
-"effective size of any request is limited to somewhere under this size."
+"into which it slurps the rest of the message.  As a result, the total length"
+" is limited to C<GUESTFS_MESSAGE_MAX> bytes (currently 4MB), which means the"
+" effective size of any request is limited to somewhere under this size."
 msgstr ""
 
 #. type: textblock
@@ -40420,8 +40248,8 @@ msgstr ""
 #: ../src/guestfs.pod:2530
 msgid ""
 "A C<FileIn> parameter indicates that we transfer a file I<into> the guest.  "
-"The normal request message is sent (see above).  However this is followed by "
-"a sequence of file chunks."
+"The normal request message is sent (see above).  However this is followed by"
+" a sequence of file chunks."
 msgstr ""
 
 #. type: verbatim
@@ -40470,8 +40298,8 @@ msgstr ""
 msgid ""
 "At time of writing there are no functions that have more than one FileIn "
 "parameter.  However this is (theoretically) supported, by sending the "
-"sequence of chunks for each FileIn parameter one after another (from left to "
-"right)."
+"sequence of chunks for each FileIn parameter one after another (from left to"
+" right)."
 msgstr ""
 
 #. type: textblock
@@ -40501,8 +40329,8 @@ msgid ""
 "This protocol allows the transfer of arbitrary sized files (no 32 bit "
 "limit), and also files where the size is not known in advance (eg. from "
 "pipes or sockets).  However the chunks are rather small "
-"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need "
-"to keep much in memory."
+"(C<GUESTFS_MAX_CHUNK_SIZE>), so that neither the library nor the daemon need"
+" to keep much in memory."
 msgstr ""
 
 #. type: =head3
@@ -40540,8 +40368,8 @@ msgstr ""
 #: ../src/guestfs.pod:2597
 msgid ""
 "When the daemon launches it sends an initial word (C<GUESTFS_LAUNCH_FLAG>) "
-"which indicates that the guest and daemon is alive.  This is what L</"
-"guestfs_launch> waits for."
+"which indicates that the guest and daemon is alive.  This is what "
+"L</guestfs_launch> waits for."
 msgstr ""
 
 #. type: =head3
@@ -40560,9 +40388,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2607
 msgid ""
-"The library turns them into progress callbacks (see L</"
-"GUESTFS_EVENT_PROGRESS>) if there is a callback registered, or discards them "
-"if not."
+"The library turns them into progress callbacks (see "
+"L</GUESTFS_EVENT_PROGRESS>) if there is a callback registered, or discards "
+"them if not."
 msgstr ""
 
 #. type: textblock
@@ -40611,11 +40439,11 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2635
 msgid ""
-"As time passes we cherry pick fixes from the development branch and backport "
-"those into the stable branch, the effect being that the stable branch should "
-"get more stable and less buggy over time.  So the stable releases are ideal "
-"for people who don't need new features but would just like the software to "
-"work."
+"As time passes we cherry pick fixes from the development branch and backport"
+" those into the stable branch, the effect being that the stable branch "
+"should get more stable and less buggy over time.  So the stable releases are"
+" ideal for people who don't need new features but would just like the "
+"software to work."
 msgstr ""
 
 #. type: textblock
@@ -40656,12 +40484,12 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2670
 msgid ""
-"A new stable branch starts when we think the new features in development are "
-"substantial and compelling enough over the current stable branch to warrant "
-"it.  When that happens we create new stable and development versions 1.N.0 "
+"A new stable branch starts when we think the new features in development are"
+" substantial and compelling enough over the current stable branch to warrant"
+" it.  When that happens we create new stable and development versions 1.N.0 "
 "and 1.(N+1).0 [N is even].  The new dot-oh release won't necessarily be so "
-"stable at this point, but by backporting fixes from development, that branch "
-"will stabilize over time."
+"stable at this point, but by backporting fixes from development, that branch"
+" will stabilize over time."
 msgstr ""
 
 #. type: =head1
@@ -40699,10 +40527,10 @@ msgstr ""
 msgid ""
 "There are two sorts of API action, depending on whether the call goes "
 "through to the daemon in the appliance, or is serviced entirely by the "
-"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the "
-"former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
-"an example of the latter, since a trace flag is maintained in the handle and "
-"all tracing is done on the library side."
+"library (see L</ARCHITECTURE> above).  L</guestfs_sync> is an example of the"
+" former, since the sync is done in the appliance.  L</guestfs_set_trace> is "
+"an example of the latter, since a trace flag is maintained in the handle and"
+" all tracing is done on the library side."
 msgstr ""
 
 #. type: textblock
@@ -40721,8 +40549,8 @@ msgid ""
 "For library-only actions of the second type, add to the "
 "C<non_daemon_functions> list.  Since these functions are serviced by the "
 "library and do not travel over the RPC mechanism to the daemon, these "
-"functions do not need a procedure number, and so the procedure number is set "
-"to C<-1>."
+"functions do not need a procedure number, and so the procedure number is set"
+" to C<-1>."
 msgstr ""
 
 #. type: textblock
@@ -40771,10 +40599,10 @@ msgstr ""
 #: ../src/guestfs.pod:2737
 msgid ""
 "You can supply zero or as many tests as you want per API call.  The tests "
-"can either be added as part of the API description (C<generator/"
-"generator_actions.ml>), or in some rarer cases you may want to drop a script "
-"into C<regressions/>.  Note that adding a script to C<regressions/> is "
-"slower, so if possible use the first method."
+"can either be added as part of the API description "
+"(C<generator/generator_actions.ml>), or in some rarer cases you may want to "
+"drop a script into C<regressions/>.  Note that adding a script to "
+"C<regressions/> is slower, so if possible use the first method."
 msgstr ""
 
 #. type: textblock
@@ -40913,8 +40741,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2802
 msgid ""
-"See C<capitests/tests.c> for more details of how these environment variables "
-"work."
+"See C<capitests/tests.c> for more details of how these environment variables"
+" work."
 msgstr ""
 
 #. type: =head2
@@ -40958,8 +40786,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2823
 msgid ""
-"If you use Emacs, add the following to one of one of your start-up files (e."
-"g., ~/.emacs), to help ensure that you get indentation right:"
+"If you use Emacs, add the following to one of one of your start-up files "
+"(e.g., ~/.emacs), to help ensure that you get indentation right:"
 msgstr ""
 
 #. type: verbatim
@@ -41033,8 +40861,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2860
 msgid ""
-"In the daemon code we have created custom printf formatters C<%Q> and C<%R>, "
-"which are used to do shell quoting."
+"In the daemon code we have created custom printf formatters C<%Q> and C<%R>,"
+" which are used to do shell quoting."
 msgstr ""
 
 #. type: =item
@@ -41079,10 +40907,10 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2883
 msgid ""
-"I<Note:> Do I<not> use these when you are passing parameters to the C<command"
-"{,r,v,rv}()> functions.  These parameters do NOT need to be quoted because "
-"they are not passed via the shell (instead, straight to exec).  You probably "
-"want to use the C<sysroot_path()> function however."
+"I<Note:> Do I<not> use these when you are passing parameters to the "
+"C<command{,r,v,rv}()> functions.  These parameters do NOT need to be quoted "
+"because they are not passed via the shell (instead, straight to exec).  You "
+"probably want to use the C<sysroot_path()> function however."
 msgstr ""
 
 #. type: =head2
@@ -41093,8 +40921,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:2891
 msgid ""
-"Submit patches to the mailing list: L<http://www.redhat.com/mailman/listinfo/"
-"libguestfs> and CC to L<rjones@redhat.com>."
+"Submit patches to the mailing list: "
+"L<http://www.redhat.com/mailman/listinfo/libguestfs> and CC to "
+"L<rjones@redhat.com>."
 msgstr ""
 
 #. type: =head2
@@ -41111,9 +40940,9 @@ msgstr ""
 #: ../src/guestfs.pod:2899
 msgid ""
 "However many messages come from the daemon, and we don't translate those at "
-"the moment.  One reason is that the appliance generally has all locale files "
-"removed from it, because they take up a lot of space.  So we'd have to readd "
-"some of those, as well as copying our PO files into the appliance."
+"the moment.  One reason is that the appliance generally has all locale files"
+" removed from it, because they take up a lot of space.  So we'd have to "
+"readd some of those, as well as copying our PO files into the appliance."
 msgstr ""
 
 #. type: textblock
@@ -41173,8 +41002,8 @@ msgstr "C<caution>"
 #. type: textblock
 #: ../src/guestfs.pod:2931
 msgid ""
-"Safety and liveness tests of components that libguestfs depends upon (not of "
-"libguestfs itself).  Mainly this is for qemu and the kernel."
+"Safety and liveness tests of components that libguestfs depends upon (not of"
+" libguestfs itself).  Mainly this is for qemu and the kernel."
 msgstr ""
 
 #. type: =item
@@ -41207,7 +41036,8 @@ msgstr "C<daemon>"
 #. type: textblock
 #: ../src/guestfs.pod:2945
 msgid ""
-"The daemon that runs inside the libguestfs appliance and carries out actions."
+"The daemon that runs inside the libguestfs appliance and carries out "
+"actions."
 msgstr ""
 
 #. type: =item
@@ -41249,8 +41079,8 @@ msgstr "C<fish>"
 #: ../src/guestfs.pod:2962
 msgid ""
 "L<guestfish(1)>, the command-line shell, and various shell scripts built on "
-"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, "
-"L<virt-tar-out(1)>."
+"top such as L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L"
+"<virt-tar-out(1)>."
 msgstr ""
 
 #. type: =item
@@ -41475,8 +41305,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3056
 msgid ""
-"When we make a stable release, there are several steps documented here.  See "
-"L</LIBGUESTFS VERSION NUMBERS> for general information about the stable "
+"When we make a stable release, there are several steps documented here.  See"
+" L</LIBGUESTFS VERSION NUMBERS> for general information about the stable "
 "branch policy."
 msgstr ""
 
@@ -41540,8 +41370,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3095
 msgid ""
-"Create new stable and development directories under L<http://libguestfs.org/"
-"download>."
+"Create new stable and development directories under "
+"L<http://libguestfs.org/download>."
 msgstr ""
 
 #. type: textblock
@@ -41585,8 +41415,8 @@ msgstr ""
 #: ../src/guestfs.pod:3121
 msgid ""
 "A simple call such as L</guestfs_cat> returns its result (the file data) in "
-"a simple string.  Because this string is at some point internally encoded as "
-"a message, the maximum size that it can return is slightly under 4 MB.  If "
+"a simple string.  Because this string is at some point internally encoded as"
+" a message, the maximum size that it can return is slightly under 4 MB.  If "
 "the requested file is larger than this then you will get an error."
 msgstr ""
 
@@ -41612,14 +41442,15 @@ msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3136
-msgid "When using virtio disks (the default) the current limit is B<25> disks."
+msgid ""
+"When using virtio disks (the default) the current limit is B<25> disks."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3139
 msgid ""
-"Virtio itself consumes 1 virtual PCI slot per disk, and PCI is limited to 31 "
-"slots.  However febootstrap only understands disks with names C</dev/vda> "
+"Virtio itself consumes 1 virtual PCI slot per disk, and PCI is limited to 31"
+" slots.  However febootstrap only understands disks with names C</dev/vda> "
 "through C</dev/vdz> (26 letters) and it reserves one disk for its own "
 "purposes."
 msgstr ""
@@ -41652,8 +41483,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3155
 msgid ""
-"This is because it reserves 4 bits for the minor device number (thus C</dev/"
-"vda>, and C</dev/vda1> through C</dev/vda15>)."
+"This is because it reserves 4 bits for the minor device number (thus "
+"C</dev/vda>, and C</dev/vda1> through C</dev/vda15>)."
 msgstr ""
 
 #. type: textblock
@@ -41706,16 +41537,16 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3180
 msgid ""
-"The MBR (ie. classic MS-DOS) partitioning scheme uses 32 bit sector "
-"numbers.  Assuming a 512 byte sector size, this means that MBR cannot "
-"address a partition located beyond 2 TB on the disk."
+"The MBR (ie. classic MS-DOS) partitioning scheme uses 32 bit sector numbers."
+"  Assuming a 512 byte sector size, this means that MBR cannot address a "
+"partition located beyond 2 TB on the disk."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3184
 msgid ""
-"It is recommended that you use GPT partitions on disks which are larger than "
-"this size.  GPT uses 64 bit sector numbers and so can address partitions "
+"It is recommended that you use GPT partitions on disks which are larger than"
+" this size.  GPT uses 64 bit sector numbers and so can address partitions "
 "which are theoretically larger than the largest disk we could support."
 msgstr ""
 
@@ -41740,8 +41571,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3197
 msgid ""
-"The API functions L</guestfs_upload>, L</guestfs_download>, L</"
-"guestfs_tar_in>, L</guestfs_tar_out> and the like allow unlimited sized "
+"The API functions L</guestfs_upload>, L</guestfs_download>, "
+"L</guestfs_tar_in>, L</guestfs_tar_out> and the like allow unlimited sized "
 "uploads and downloads."
 msgstr ""
 
@@ -41791,21 +41622,21 @@ msgstr ""
 msgid ""
 "L<guestfs-examples(3)>, L<guestfs-erlang(3)>, L<guestfs-java(3)>, L<guestfs-"
 "ocaml(3)>, L<guestfs-perl(3)>, L<guestfs-python(3)>, L<guestfs-ruby(3)>, "
-"L<guestfish(1)>, L<guestmount(1)>, L<virt-alignment-scan(1)>, L<virt-cat(1)"
-">, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-edit(1)>, "
-"L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-filesystems(1)>, "
-"L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-fs(1)>, L<virt-rescue"
-"(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-sysprep(1)>, L<virt-tar"
-"(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-win-reg(1)>, L<qemu(1)>, "
-"L<febootstrap(1)>, L<febootstrap-supermin-helper(8)>, L<hivex(3)>, L<stap(1)"
-">, L<http://libguestfs.org/>."
+"L<guestfish(1)>, L<guestmount(1)>, L<virt-alignment-scan(1)>, L<virt-"
+"cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, L<virt-df(1)>, L<virt-"
+"edit(1)>, L<virt-filesystems(1)>, L<virt-inspector(1)>, L<virt-list-"
+"filesystems(1)>, L<virt-list-partitions(1)>, L<virt-ls(1)>, L<virt-make-"
+"fs(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, L<virt-sparsify(1)>, L<virt-"
+"sysprep(1)>, L<virt-tar(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<virt-"
+"win-reg(1)>, L<qemu(1)>, L<febootstrap(1)>, L<febootstrap-supermin-"
+"helper(8)>, L<hivex(3)>, L<stap(1)>, L<http://libguestfs.org/>."
 msgstr ""
 
 #. type: textblock
 #: ../src/guestfs.pod:3308
 msgid ""
-"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, L<lvm"
-"(8)>, L<disktype(1)>."
+"Tools with a similar purpose: L<fdisk(8)>, L<parted(8)>, L<kpartx(8)>, "
+"L<lvm(8)>, L<disktype(1)>."
 msgstr ""
 
 #. type: =head1
@@ -41824,11 +41655,9 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3319
 msgid ""
-"L<https://bugzilla.redhat.com/buglist.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/buglist.cgi?component=libguestfs&product=Virtualization+Tools>"
 msgstr ""
-"L<https://bugzilla.redhat.com/buglist.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/buglist.cgi?component=libguestfs&product=Virtualization+Tools>"
 
 #. type: textblock
 #: ../src/guestfs.pod:3321
@@ -41838,11 +41667,9 @@ msgstr "Для звітування щодо вад у libguestfs скорист
 #. type: textblock
 #: ../src/guestfs.pod:3323
 msgid ""
-"L<https://bugzilla.redhat.com/enter_bug.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools>"
 msgstr ""
-"L<https://bugzilla.redhat.com/enter_bug.cgi?"
-"component=libguestfs&product=Virtualization+Tools>"
+"L<https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools>"
 
 #. type: textblock
 #: ../src/guestfs.pod:3325
@@ -41867,8 +41694,8 @@ msgstr ""
 #. type: textblock
 #: ../src/guestfs.pod:3343
 msgid ""
-"Run libguestfs-test-tool and paste the B<complete, unedited> output into the "
-"bug report."
+"Run libguestfs-test-tool and paste the B<complete, unedited> output into the"
+" bug report."
 msgstr ""
 
 #. type: textblock
@@ -41935,8 +41762,8 @@ msgstr ""
 msgid ""
 "If it fails (and/or exits with non-zero error code), please paste the "
 "I<complete, unedited> output of the test tool into a bug report.  More "
-"information about reporting bugs can be found on the L<http://libguestfs.org/"
-"> website."
+"information about reporting bugs can be found on the "
+"L<http://libguestfs.org/> website."
 msgstr ""
 
 #. type: textblock
@@ -42029,8 +41856,8 @@ msgstr ""
 #. type: textblock
 #: ../test-tool/libguestfs-test-tool.pod:82
 msgid ""
-"Refer to L<febootstrap-supermin-helper(8)/ENVIRONMENT VARIABLES> for further "
-"information."
+"Refer to L<febootstrap-supermin-helper(8)/ENVIRONMENT VARIABLES> for further"
+" information."
 msgstr ""
 
 #. type: =head1
@@ -42096,16 +41923,16 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-list-filesystems.pl:45
 msgid ""
-"C<virt-list-filesystems> is a command line tool to list the filesystems that "
-"are contained in a virtual machine or disk image."
+"C<virt-list-filesystems> is a command line tool to list the filesystems that"
+" are contained in a virtual machine or disk image."
 msgstr ""
 
 #. type: textblock
 #: ../tools/virt-list-filesystems.pl:49
 msgid ""
 "C<virt-list-filesystems> is just a simple wrapper around L<libguestfs(3)> "
-"functionality.  For more complex cases you should look at the L<guestfish(1)"
-"> tool."
+"functionality.  For more complex cases you should look at the "
+"L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -42131,12 +41958,12 @@ msgstr ""
 #: ../tools/virt-list-filesystems.pl:197
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-tar(1)>, L<virt-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, L<Sys::"
-"Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-tar(1)>, L<virt-"
-"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, L<Sys::"
-"Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-list-partitions(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../tools/virt-list-filesystems.pl:214 ../tools/virt-tar.pl:317
@@ -42181,8 +42008,8 @@ msgstr ""
 #: ../tools/virt-list-partitions.pl:50
 msgid ""
 "C<virt-list-partitions> is just a simple wrapper around L<libguestfs(3)> "
-"functionality.  For more complex cases you should look at the L<guestfish(1)"
-"> tool."
+"functionality.  For more complex cases you should look at the "
+"L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -42193,8 +42020,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-list-partitions.pl:123
 msgid ""
-"With this option, C<virt-list-partitions> displays the type and size of each "
-"partition too (where \"type\" means C<ext3>, C<pv> etc.)"
+"With this option, C<virt-list-partitions> displays the type and size of each"
+" partition too (where \"type\" means C<ext3>, C<pv> etc.)"
 msgstr ""
 
 #. type: =item
@@ -42217,12 +42044,12 @@ msgstr ""
 #: ../tools/virt-list-partitions.pl:267
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib"
-"(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfs(3)>, L<guestfish(1)>, L<virt-filesystems(1)>, L<virt-list-"
-"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib"
-"(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"filesystems(1)>, L<virt-resize(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../tools/virt-list-partitions.pl:283
@@ -42262,11 +42089,11 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:49
 msgid ""
 "Virt-make-fs is a command line tool for creating a filesystem from a tar "
-"archive or some files in a directory.  It is similar to tools like L<mkisofs"
-"(1)>, L<genisoimage(1)> and L<mksquashfs(1)>.  Unlike those tools, it can "
-"create common filesystem types like ext2/3 or NTFS, which can be useful if "
-"you want to attach these filesystems to existing virtual machines (eg. to "
-"import large amounts of read-only data to a VM)."
+"archive or some files in a directory.  It is similar to tools like "
+"L<mkisofs(1)>, L<genisoimage(1)> and L<mksquashfs(1)>.  Unlike those tools, "
+"it can create common filesystem types like ext2/3 or NTFS, which can be "
+"useful if you want to attach these filesystems to existing virtual machines "
+"(eg. to import large amounts of read-only data to a VM)."
 msgstr ""
 
 #. type: textblock
@@ -42276,16 +42103,11 @@ msgstr ""
 
 #. type: verbatim
 #: ../tools/virt-make-fs.pl:59
-#, fuzzy, no-wrap
-#| msgid ""
-#| " virt-make-fs --format=qcow2 --size=+200M input output.img\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " virt-make-fs input output.img\n"
 "\n"
 msgstr ""
-" virt-make-fs --format=qcow2 --size=+200M input output.img\n"
-"\n"
 
 #. type: textblock
 #: ../tools/virt-make-fs.pl:61
@@ -42293,8 +42115,8 @@ msgid ""
 "where C<input> is either a directory containing files that you want to add, "
 "or a tar archive (either uncompressed tar or gzip-compressed tar); and "
 "C<output.img> is a disk image.  The input type is detected automatically.  "
-"The output disk image defaults to a raw ext2 sparse image unless you specify "
-"extra flags (see L</OPTIONS> below)."
+"The output disk image defaults to a raw ext2 sparse image unless you specify"
+" extra flags (see L</OPTIONS> below)."
 msgstr ""
 
 #. type: =head2
@@ -42305,8 +42127,8 @@ msgstr "ТИП ФАЙЛОВОЇ СИСТЕМИ"
 #. type: textblock
 #: ../tools/virt-make-fs.pl:69
 msgid ""
-"The default filesystem type is C<ext2>.  Just about any filesystem type that "
-"libguestfs supports can be used (but I<not> read-only formats like "
+"The default filesystem type is C<ext2>.  Just about any filesystem type that"
+" libguestfs supports can be used (but I<not> read-only formats like "
 "ISO9660).  Here are some of the more common choices:"
 msgstr ""
 
@@ -42318,9 +42140,9 @@ msgstr "I<ext3>"
 #. type: textblock
 #: ../tools/virt-make-fs.pl:77
 msgid ""
-"Note that ext3 filesystems contain a journal, typically 1-32 MB in size.  If "
-"you are not going to use the filesystem in a way that requires the journal, "
-"then this is just wasted overhead."
+"Note that ext3 filesystems contain a journal, typically 1-32 MB in size.  If"
+" you are not going to use the filesystem in a way that requires the journal,"
+" then this is just wasted overhead."
 msgstr ""
 
 #. type: =item
@@ -42336,8 +42158,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:85
 msgid ""
-"I<Note for vfat>: The tar archive or local directory must only contain files "
-"which are owned by root (ie. UID:GID = 0:0).  The reason is that the tar "
+"I<Note for vfat>: The tar archive or local directory must only contain files"
+" which are owned by root (ie. UID:GID = 0:0).  The reason is that the tar "
 "program running within libguestfs is unable to change the ownership of non-"
 "root files, since vfat itself does not support this."
 msgstr ""
@@ -42390,8 +42212,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:110
 msgid ""
-"On the other hand, if you have a partition table then the output image is no "
-"longer a straight filesystem.  For example you cannot run L<fsck(8)> "
+"On the other hand, if you have a partition table then the output image is no"
+" longer a straight filesystem.  For example you cannot run L<fsck(8)> "
 "directly on a partitioned disk image.  (However libguestfs tools such as "
 "L<guestfish(1)> and L<virt-resize(1)> can still be used)."
 msgstr ""
@@ -42435,8 +42257,8 @@ msgid ""
 "Unlike formats such as tar and squashfs, a filesystem does not \"just fit\" "
 "the files that it contains, but might have extra space.  Depending on how "
 "you are going to use the output, you might think this extra space is wasted "
-"and want to minimize it, or you might want to leave space so that more files "
-"can be added later.  Virt-make-fs defaults to minimizing the extra space, "
+"and want to minimize it, or you might want to leave space so that more files"
+" can be added later.  Virt-make-fs defaults to minimizing the extra space, "
 "but you can use the I<--size> flag to leave space in the filesystem if you "
 "want it."
 msgstr ""
@@ -42446,10 +42268,10 @@ msgstr ""
 msgid ""
 "An alternative way to leave extra space but not make the output image any "
 "bigger is to use an alternative disk image format (instead of the default "
-"\"raw\" format).  Using I<--format=qcow2> will use the native QEmu/KVM qcow2 "
-"image format (check your hypervisor supports this before using it).  This "
-"allows you to choose a large I<--size> but the extra space won't actually be "
-"allocated in the image until you try to store something in it."
+"\"raw\" format).  Using I<--format=qcow2> will use the native QEmu/KVM qcow2"
+" image format (check your hypervisor supports this before using it).  This "
+"allows you to choose a large I<--size> but the extra space won't actually be"
+" allocated in the image until you try to store something in it."
 msgstr ""
 
 #. type: textblock
@@ -42511,8 +42333,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:199
 msgid ""
-"To choose a fixed size output disk, specify an absolute number followed by b/"
-"K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
+"To choose a fixed size output disk, specify an absolute number followed by "
+"b/K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
 "Petabytes or Exabytes.  This must be large enough to contain all the input "
 "files, else you will get an error."
 msgstr ""
@@ -42520,8 +42342,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:204
 msgid ""
-"To leave extra space, specify C<+> (plus sign) and a number followed by b/K/"
-"M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
+"To leave extra space, specify C<+> (plus sign) and a number followed by "
+"b/K/M/G/T/P/E to mean bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, "
 "Petabytes or Exabytes.  For example: I<--size=+200M> means enough space for "
 "the input files, and (approximately) an extra 200 MB free space."
 msgstr ""
@@ -42530,9 +42352,9 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:210
 msgid ""
 "Note that virt-make-fs estimates free space, and therefore will not produce "
-"filesystems containing precisely the free space requested.  (It is much more "
-"expensive and time-consuming to produce a filesystem which has precisely the "
-"desired free space)."
+"filesystems containing precisely the free space requested.  (It is much more"
+" expensive and time-consuming to produce a filesystem which has precisely "
+"the desired free space)."
 msgstr ""
 
 #. type: =item
@@ -42601,7 +42423,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:253
 msgid ""
-"If specified, this flag adds an MBR partition table to the output disk image."
+"If specified, this flag adds an MBR partition table to the output disk "
+"image."
 msgstr ""
 
 #. type: textblock
@@ -42620,16 +42443,11 @@ msgstr ""
 
 #. type: verbatim
 #: ../tools/virt-make-fs.pl:263
-#, fuzzy, no-wrap
-#| msgid ""
-#| " virt-make-fs --partition input.tar ...\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " virt-make-fs --partition input.tar output.img\n"
 "\n"
 msgstr ""
-" virt-make-fs --partition input.tar ...\n"
-"\n"
 
 #. type: textblock
 #: ../tools/virt-make-fs.pl:265
@@ -42641,16 +42459,11 @@ msgstr ""
 
 #. type: verbatim
 #: ../tools/virt-make-fs.pl:269
-#, fuzzy, no-wrap
-#| msgid ""
-#| " virt-make-fs --partition -- input.tar ...\n"
-#| "\n"
+#, no-wrap
 msgid ""
 " virt-make-fs --partition -- input.tar output.img\n"
 "\n"
 msgstr ""
-" virt-make-fs --partition -- input.tar ...\n"
-"\n"
 
 #. type: textblock
 #: ../tools/virt-make-fs.pl:271
@@ -42661,12 +42474,12 @@ msgstr ""
 #: ../tools/virt-make-fs.pl:559
 msgid ""
 "L<guestfish(1)>, L<virt-resize(1)>, L<virt-tar-in(1)>, L<mkisofs(1)>, "
-"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, L<guestfs"
-"(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
+"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, "
+"L<guestfs(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
 msgstr ""
 "L<guestfish(1)>, L<virt-resize(1)>, L<virt-tar-in(1)>, L<mkisofs(1)>, "
-"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, L<guestfs"
-"(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
+"L<genisoimage(1)>, L<mksquashfs(1)>, L<mke2fs(8)>, L<resize2fs(8)>, "
+"L<guestfs(3)>, L<Sys::Guestfs(3)>, L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../tools/virt-make-fs.pl:573 ../tools/virt-win-reg.pl:774
@@ -42690,8 +42503,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-make-fs.pl:579
 msgid ""
-"Attach /tmp/virt-make-fs.log to a new bug report at L<https://bugzilla."
-"redhat.com/>"
+"Attach /tmp/virt-make-fs.log to a new bug report at "
+"L<https://bugzilla.redhat.com/>"
 msgstr ""
 
 #. type: textblock
@@ -42789,8 +42602,8 @@ msgstr ""
 #: ../tools/virt-tar.pl:66
 msgid ""
 "You must I<not> use C<virt-tar> with the I<-u> option (upload) on live "
-"virtual machines.  If you do this, you risk disk corruption in the VM.  "
-"C<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
+"virtual machines.  If you do this, you risk disk corruption in the VM.  C"
+"<virt-tar> tries to stop you from doing this, but doesn't catch all cases."
 msgstr ""
 
 #. type: textblock
@@ -42816,8 +42629,8 @@ msgstr ""
 #: ../tools/virt-tar.pl:84
 msgid ""
 "If you want to just view a single file, use L<virt-cat(1)>.  If you just "
-"want to edit a single file, use L<virt-edit(1)>.  For more complex cases you "
-"should look at the L<guestfish(1)> tool."
+"want to edit a single file, use L<virt-edit(1)>.  For more complex cases you"
+" should look at the L<guestfish(1)> tool."
 msgstr ""
 
 #. type: textblock
@@ -42825,8 +42638,8 @@ msgstr ""
 msgid ""
 "There are two modes of operation: I<-x> (eXtract) downloads a directory and "
 "its contents (recursively) from the virtual machine into a local tarball.  "
-"I<-u> uploads from a local tarball, unpacking it into a directory inside the "
-"virtual machine.  You cannot use these two options together."
+"I<-u> uploads from a local tarball, unpacking it into a directory inside the"
+" virtual machine.  You cannot use these two options together."
 msgstr ""
 
 #. type: textblock
@@ -42842,8 +42655,8 @@ msgstr ""
 msgid ""
 "C<virt-tar> can only handle tar (optionally gzipped) format tarballs.  For "
 "example it cannot do PKZip files or bzip2 compression.  If you want that "
-"then you'll have to rebuild the tarballs yourself.  (This is a limitation of "
-"the L<libguestfs(3)> API)."
+"then you'll have to rebuild the tarballs yourself.  (This is a limitation of"
+" the L<libguestfs(3)> API)."
 msgstr ""
 
 #. type: =item
@@ -42876,8 +42689,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-tar.pl:171
 msgid ""
-"Use I<-u> to upload and unpack from a local tarball into a virtual machine.  "
-"Please read the L</WARNING> section above before using this option."
+"Use I<-u> to upload and unpack from a local tarball into a virtual machine."
+"  Please read the L</WARNING> section above before using this option."
 msgstr ""
 
 #. type: textblock
@@ -42903,20 +42716,21 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-tar.pl:298
 msgid ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-copy-"
-"in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<Sys::"
-"Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs."
-"org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-"
+"copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, "
+"L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, "
+"L<http://libguestfs.org/>."
 msgstr ""
-"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-copy-"
-"in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, L<Sys::"
-"Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, L<http://libguestfs."
-"org/>."
+"L<guestfs(3)>, L<guestfish(1)>, L<virt-cat(1)>, L<virt-edit(1)>, L<virt-"
+"copy-in(1)>, L<virt-copy-out(1)>, L<virt-tar-in(1)>, L<virt-tar-out(1)>, "
+"L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Sys::Virt(3)>, "
+"L<http://libguestfs.org/>."
 
 #. type: textblock
 #: ../tools/virt-win-reg.pl:37
 msgid ""
-"virt-win-reg - Export and merge Windows Registry entries from a Windows guest"
+"virt-win-reg - Export and merge Windows Registry entries from a Windows "
+"guest"
 msgstr ""
 
 #. type: verbatim
@@ -42971,10 +42785,10 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:58
 msgid ""
-"Modifying the Windows Registry is an inherently risky operation.  The format "
-"is deliberately obscure and undocumented, and Registry changes can leave the "
-"system unbootable.  Therefore when using the I<--merge> option, make sure "
-"you have a reliable backup first."
+"Modifying the Windows Registry is an inherently risky operation.  The format"
+" is deliberately obscure and undocumented, and Registry changes can leave "
+"the system unbootable.  Therefore when using the I<--merge> option, make "
+"sure you have a reliable backup first."
 msgstr ""
 
 #. type: textblock
@@ -42994,8 +42808,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:71
 msgid ""
-"If I<--merge> is I<not> specified, then the chosen registry key is displayed/"
-"exported (recursively).  For example:"
+"If I<--merge> is I<not> specified, then the chosen registry key is "
+"displayed/exported (recursively).  For example:"
 msgstr ""
 
 #. type: verbatim
@@ -43050,8 +42864,8 @@ msgstr ""
 msgid ""
 "This program is only meant for simple access to the registry.  If you want "
 "to do complicated things with the registry, we suggest you download the "
-"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)> "
-"and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
+"Registry hive files from the guest using L<libguestfs(3)> or L<guestfish(1)>"
+" and access them locally, eg. using L<hivex(3)>, L<hivexsh(1)> or "
 "L<hivexregedit(1)>."
 msgstr ""
 
@@ -43072,8 +42886,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:165
 msgid ""
 "Note that I<--merge> is I<unsafe> to use on live virtual machines, and will "
-"result in disk corruption.  However exporting (without this flag)  is always "
-"safe."
+"result in disk corruption.  However exporting (without this flag)  is always"
+" safe."
 msgstr ""
 
 #. type: =item
@@ -43085,8 +42899,8 @@ msgstr "B<--encoding> UTF-16LE|ASCII"
 #: ../tools/virt-win-reg.pl:175
 msgid ""
 "When merging (only), you may need to specify the encoding for strings to be "
-"used in the hive file.  This is explained in detail in L<Win::Hivex::Regedit"
-"(3)/ENCODING STRINGS>."
+"used in the hive file.  This is explained in detail in "
+"L<Win::Hivex::Regedit(3)/ENCODING STRINGS>."
 msgstr ""
 
 #. type: textblock
@@ -43104,16 +42918,16 @@ msgstr "B<--unsafe-printable-strings>"
 #. type: textblock
 #: ../tools/virt-win-reg.pl:188
 msgid ""
-"When exporting (only), assume strings are UTF-16LE and print them as strings "
-"instead of hex sequences.  Remove the final zero codepoint from strings if "
+"When exporting (only), assume strings are UTF-16LE and print them as strings"
+" instead of hex sequences.  Remove the final zero codepoint from strings if "
 "present."
 msgstr ""
 
 #. type: textblock
 #: ../tools/virt-win-reg.pl:192
 msgid ""
-"This is unsafe and does not preserve the fidelity of strings in the original "
-"Registry for various reasons:"
+"This is unsafe and does not preserve the fidelity of strings in the original"
+" Registry for various reasons:"
 msgstr ""
 
 #. type: textblock
@@ -43219,8 +43033,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:585
 msgid ""
-"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for "
-"C<HKEY_USERS>."
+"You can use C<HKLM> as a shorthand for C<HKEY_LOCAL_MACHINE>, and C<HKU> for"
+" C<HKEY_USERS>."
 msgstr ""
 
 #. type: textblock
@@ -43265,8 +43079,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:604
 msgid ""
-"To go in the opposite direction, after exporting and before sending the file "
-"to a Windows user, do something like this:"
+"To go in the opposite direction, after exporting and before sending the file"
+" to a Windows user, do something like this:"
 msgstr ""
 
 #. type: verbatim
@@ -43324,8 +43138,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:627
 msgid ""
 "C<CurrentControlSet> is usually an alias for C<ControlSet001>.  In some "
-"circumstances it might refer to another control set.  The way to find out is "
-"to look at the C<HKLM\\SYSTEM\\Select> key:"
+"circumstances it might refer to another control set.  The way to find out is"
+" to look at the C<HKLM\\SYSTEM\\Select> key:"
 msgstr ""
 
 #. type: verbatim
@@ -43371,12 +43185,11 @@ msgstr ""
 
 #. type: verbatim
 #: ../tools/virt-win-reg.pl:647
-#, fuzzy, no-wrap
-#| msgid "C<HKEY_LOCAL_MACHINE\\SAM>"
+#, no-wrap
 msgid ""
 " [-HKEY_LOCAL_MACHINE\\Foo]\n"
 "\n"
-msgstr "C<HKEY_LOCAL_MACHINE\\SAM>"
+msgstr ""
 
 #. type: textblock
 #: ../tools/virt-win-reg.pl:649
@@ -43385,13 +43198,12 @@ msgstr ""
 
 #. type: verbatim
 #: ../tools/virt-win-reg.pl:651
-#, fuzzy, no-wrap
-#| msgid "C<HKEY_LOCAL_MACHINE\\SAM>"
+#, no-wrap
 msgid ""
 " [HKEY_LOCAL_MACHINE\\Foo]\n"
 " \"Value\"=-\n"
 "\n"
-msgstr "C<HKEY_LOCAL_MACHINE\\SAM>"
+msgstr ""
 
 #. type: =head1
 #: ../tools/virt-win-reg.pl:654
@@ -43401,8 +43213,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:656
 msgid ""
-"Note that some of these tips modify the guest disk image.  The guest I<must> "
-"be shut off, else you will get disk corruption."
+"Note that some of these tips modify the guest disk image.  The guest I<must>"
+" be shut off, else you will get disk corruption."
 msgstr ""
 
 #. type: =head2
@@ -43453,8 +43265,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:674
 msgid ""
 "In this example we use the key C<RunOnce> which means that the script will "
-"run precisely once when the first user logs in.  If you want it to run every "
-"time a user logs in, replace C<RunOnce> with C<Run>."
+"run precisely once when the first user logs in.  If you want it to run every"
+" time a user logs in, replace C<RunOnce> with C<Run>."
 msgstr ""
 
 #. type: textblock
@@ -43488,7 +43300,8 @@ msgstr ""
 #: ../tools/virt-win-reg.pl:689
 msgid ""
 "First upload the program and optionally the service wrapper.  In this case "
-"the test program is called C<test.exe> and we are using the RHSrvAny wrapper:"
+"the test program is called C<test.exe> and we are using the RHSrvAny "
+"wrapper:"
 msgstr ""
 
 #. type: verbatim
@@ -43608,13 +43421,15 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:759
 msgid ""
-"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, L<guestfish(1)"
-">, L<virt-cat(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Win::Hivex"
-"(3)>, L<Win::Hivex::Regedit(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, "
+"L<guestfish(1)>, L<virt-cat(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Win::Hivex(3)>, L<Win::Hivex::Regedit(3)>, "
+"L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 msgstr ""
-"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, L<guestfish(1)"
-">, L<virt-cat(1)>, L<Sys::Guestfs(3)>, L<Sys::Guestfs::Lib(3)>, L<Win::Hivex"
-"(3)>, L<Win::Hivex::Regedit(3)>, L<Sys::Virt(3)>, L<http://libguestfs.org/>."
+"L<hivex(3)>, L<hivexsh(1)>, L<hivexregedit(1)>, L<guestfs(3)>, "
+"L<guestfish(1)>, L<virt-cat(1)>, L<Sys::Guestfs(3)>, "
+"L<Sys::Guestfs::Lib(3)>, L<Win::Hivex(3)>, L<Win::Hivex::Regedit(3)>, "
+"L<Sys::Virt(3)>, L<http://libguestfs.org/>."
 
 #. type: verbatim
 #: ../tools/virt-win-reg.pl:777
@@ -43628,13 +43443,8 @@ msgstr ""
 #. type: textblock
 #: ../tools/virt-win-reg.pl:780
 msgid ""
-"Attach /tmp/virt-win-reg.log to a new bug report at L<https://bugzilla."
-"redhat.com/>"
+"Attach /tmp/virt-win-reg.log to a new bug report at "
+"L<https://bugzilla.redhat.com/>"
 msgstr ""
 
-#~ msgid ""
-#~ " guestfs_dd (g, \"/dev/VG/Original\", \"/dev/VG/Copy\");\n"
-#~ "\n"
-#~ msgstr ""
-#~ " guestfs_dd (g, \"/dev/VG/Original\", \"/dev/VG/Copy\");\n"
-#~ "\n"
+
diff --git a/po/en_GB.po b/po/en_GB.po
index fe3921e8..e9f2ab47 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
 "fedora/team/en_GB/)\n"
diff --git a/po/es.po b/po/es.po
index fd2bd044..50432329 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Spanish (Castilian) <trans-es@lists.fedoraproject.org>\n"
 "Language: es\n"
@@ -701,24 +701,20 @@ msgid "add qemu parameters"
 msgstr "agrega parámetros qemu"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "copia desde la fuente hacia el destino utilizando dd"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "copia desde la fuente hacia el destino utilizando dd"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "copia desde la fuente hacia el destino utilizando dd"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "copia desde la fuente hacia el destino utilizando dd"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -754,9 +750,8 @@ msgid "debug the QEMU command line (internal use only)"
 msgstr "depura la línea de comandos de QEMU (sólo para uso interno)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr "depura la línea de comandos de QEMU (sólo para uso interno)"
+msgstr ""
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -1502,9 +1497,8 @@ msgid "convert partition name to device name"
 msgstr "convierte el nombre de una partición a nombre de dispositivo"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "convierte el nombre de una partición a nombre de dispositivo"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/gu.po b/po/gu.po
index 9ac715b4..263a8083 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
 "Language: gu\n"
@@ -557,24 +557,20 @@ msgid "add qemu parameters"
 msgstr "qemu પરિમાણોને ઉમેરો"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd ની મદદથી લક્ષ્ય માટે સ્ત્રોત માંથી નકલ કરો"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd ની મદદથી લક્ષ્ય માટે સ્ત્રોત માંથી નકલ કરો"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd ની મદદથી લક્ષ્ય માટે સ્ત્રોત માંથી નકલ કરો"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd ની મદદથી લક્ષ્ય માટે સ્ત્રોત માંથી નકલ કરો"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1339,9 +1335,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ખાલી પાર્ટીશન કોષ્ટકને બનાવો"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/hi.po b/po/hi.po
index 370c664e..1eb2b96f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
 "Language: hi\n"
@@ -557,24 +557,20 @@ msgid "add qemu parameters"
 msgstr "qemu पैरामीटर जोड़ें"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd के उपयोग से स्रोत से गंतव्य में कॉपी करें"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd के उपयोग से स्रोत से गंतव्य में कॉपी करें"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd के उपयोग से स्रोत से गंतव्य में कॉपी करें"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd के उपयोग से स्रोत से गंतव्य में कॉपी करें"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1339,9 +1335,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "कोई रिक्त विभाजन सारणी बनाएँ"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/kn.po b/po/kn.po
index f1964f79..9c74ab79 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
 "kn/)\n"
@@ -560,24 +560,20 @@ msgid "add qemu parameters"
 msgstr "qemu ನಿಯತಾಂಕಗಳನ್ನು ಸೇರಿಸು"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd ಅನ್ನು ಬಳಸಿಕೊಂಡು ಮೂಲದಿಂದ ಗುರಿಗೆ ಕಾಪಿ ಮಾಡು"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd ಅನ್ನು ಬಳಸಿಕೊಂಡು ಮೂಲದಿಂದ ಗುರಿಗೆ ಕಾಪಿ ಮಾಡು"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd ಅನ್ನು ಬಳಸಿಕೊಂಡು ಮೂಲದಿಂದ ಗುರಿಗೆ ಕಾಪಿ ಮಾಡು"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd ಅನ್ನು ಬಳಸಿಕೊಂಡು ಮೂಲದಿಂದ ಗುರಿಗೆ ಕಾಪಿ ಮಾಡು"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1342,9 +1338,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ಒಂದು ಖಾಲಿ ವಿಭಜನಾ ಕೋಷ್ಟಕವನ್ನು ರಚಿಸು"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/ml.po b/po/ml.po
index ab4554e9..bd4a85eb 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "Language: ml\n"
@@ -556,24 +556,20 @@ msgid "add qemu parameters"
 msgstr "qemu പരാമീറ്ററുകള്‍ ചേര്‍ക്കുക"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd ഉപയോഗിച്ചു് ഉറവിടത്തില്‍ നിന്നും ലക്ഷ്യസ്ഥാനത്തേക്കു് പകര്‍ത്തുക"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd ഉപയോഗിച്ചു് ഉറവിടത്തില്‍ നിന്നും ലക്ഷ്യസ്ഥാനത്തേക്കു് പകര്‍ത്തുക"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd ഉപയോഗിച്ചു് ഉറവിടത്തില്‍ നിന്നും ലക്ഷ്യസ്ഥാനത്തേക്കു് പകര്‍ത്തുക"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd ഉപയോഗിച്ചു് ഉറവിടത്തില്‍ നിന്നും ലക്ഷ്യസ്ഥാനത്തേക്കു് പകര്‍ത്തുക"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1340,9 +1336,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ഒരു കാലി പാര്‍ട്ടീഷന്‍ ടേബിള്‍ ഉണ്ടാക്കുക"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/mr.po b/po/mr.po
index cfeb6e29..894f06e3 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
 "mr/)\n"
@@ -630,24 +630,20 @@ msgid "add qemu parameters"
 msgstr "qemu घटके समावेश करा"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd चा वापर करून स्रोत पासून लक्ष्यमध्ये प्रत बनवा"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd चा वापर करून स्रोत पासून लक्ष्यमध्ये प्रत बनवा"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd चा वापर करून स्रोत पासून लक्ष्यमध्ये प्रत बनवा"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd चा वापर करून स्रोत पासून लक्ष्यमध्ये प्रत बनवा"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -682,9 +678,8 @@ msgid "debug the QEMU command line (internal use only)"
 msgstr "QEMU आदेश ओळ डिबग करा (फक्त आंतरिक वापरसाठी)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr "QEMU आदेश ओळ डिबग करा (फक्त आंतरिक वापरसाठी)"
+msgstr ""
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -1413,9 +1408,8 @@ msgid "convert partition name to device name"
 msgstr "विभाजननाव यांस साधणनावात रूपांतरीत करा"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "विभाजननाव यांस साधणनावात रूपांतरीत करा"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/nl.po b/po/nl.po
index e30fd617..ed41691f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
 "Language: nl\n"
@@ -48,6 +48,22 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: check uitlijning van virtuele machine partities\n"
+"Copyright (C) 2011 Red Hat Inc.\n"
+"Gebruik:\n"
+"  %s [--opties] -d domnaam\n"
+"  %s [--opties] -a disk.img [-a disk.img ...]\n"
+"Opties:\n"
+"  -a|--add image       Voeg image toe\n"
+"  -c|--connect uri     Specificeer libvirt URI voor -d optie\n"
+"  -d|--domain guest    Voegen schijven van libvirt gast toe\n"
+"  --format[=raw|..]    Forceer schijfformaat voor -a optie\n"
+"  --help               Toon korte hulp\n"
+"  -q|--quiet           Geen output, alleen exit code\n"
+"  -v|--verbose         Breedsprakige boodschapen\n"
+"  -V|--version         Toon versie en sluit af\n"
+"  -x                   Traceer libguestfs API aanroepen\n"
+"Voor meer informatie, zie de manpagina %s(1).\n"
 
 #: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
 #: cat/virt-ls.c:192 df/domains.c:429 df/main.c:136 edit/virt-edit.c:141
@@ -67,11 +83,11 @@ msgstr "%s: onbekende lange optie: %s (%d)\n"
 
 #: align/scan.c:269
 msgid "alignment < 4K"
-msgstr ""
+msgstr "uitlijning < 4K"
 
 #: align/scan.c:274
 msgid "alignment < 64K"
-msgstr ""
+msgstr "uitlijning < 64K"
 
 #: cat/virt-cat.c:65
 #, c-format
@@ -674,35 +690,31 @@ msgstr "voer een opdracht uit, regels worden teruggegeven"
 
 #: fish/cmds.c:2775
 msgid "output compressed device"
-msgstr ""
+msgstr "output gecomprimeerd apparaat"
 
 #: fish/cmds.c:2776
 msgid "output compressed file"
-msgstr ""
+msgstr "output gecomprimeerd bestand"
 
 #: fish/cmds.c:2777
 msgid "add qemu parameters"
 msgstr "voeg qemu parameters toe"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "kopieer van bron naar bestemming met dd"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "kopieer van bron naar bestemming met dd"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "kopieer van bron naar bestemming met dd"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "kopieer van bron naar bestemming met dd"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -737,9 +749,8 @@ msgid "debug the QEMU command line (internal use only)"
 msgstr "debug de QEMU commando-regel (alleen voor intern gebruik)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr "debug de QEMU commando-regel (alleen voor intern gebruik)"
+msgstr "debug de stations (alleen voor intern gebruik)"
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -910,7 +921,7 @@ msgstr "verkrijg SELinux aanzetten vlag"
 
 #: fish/cmds.c:2836
 msgid "get number of virtual CPUs in appliance"
-msgstr ""
+msgstr "verkrijg aantal virtuele CPU's in toepassing"
 
 #: fish/cmds.c:2837
 msgid "get the current state"
@@ -950,7 +961,7 @@ msgstr "expandeer een wildcard pad"
 
 #: fish/cmds.c:2848
 msgid "install GRUB 1"
-msgstr ""
+msgstr "installeer GRUB 1"
 
 #: fish/cmds.c:2849
 msgid "return first 10 lines of a file"
@@ -1473,9 +1484,8 @@ msgid "convert partition name to device name"
 msgstr "converteer partitie naam naar apparaat naam"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "converteer partitie naam naar apparaat naam"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
@@ -1645,7 +1655,7 @@ msgstr "zet SELinux aan of uit bij opstarten van het toestel"
 
 #: fish/cmds.c:3033
 msgid "set number of virtual CPUs in appliance"
-msgstr ""
+msgstr "stel aantal virtuele CPU's in toepassing in"
 
 #: fish/cmds.c:3034
 msgid "enable or disable command traces"
@@ -1661,7 +1671,7 @@ msgstr "stel SELinux beveiliging context in"
 
 #: fish/cmds.c:3037
 msgid "set an environment variable"
-msgstr ""
+msgstr "stel een omgevingsvariabele in"
 
 #: fish/cmds.c:3039 fish/cmds.c:3040
 msgid "create partitions on a block device"
@@ -1810,7 +1820,7 @@ msgstr "koppel alle bestandssystemen af"
 
 #: fish/cmds.c:3079
 msgid "unset an environment variable"
-msgstr ""
+msgstr "verwijdereen omgevingsvariabele"
 
 #: fish/cmds.c:3080
 msgid "upload a file from the local machine"
@@ -2481,7 +2491,7 @@ msgstr ""
 #: fish/fish.c:1197
 #, c-format
 msgid "%s:%d: libguestfs: error: %s\n"
-msgstr ""
+msgstr "%s:%d: libguestfs: fout: %s\n"
 
 #: fish/fish.c:1353
 #, c-format
@@ -2831,12 +2841,12 @@ msgstr "reopen: guestfs_create: hendel aanmaken mislukte\n"
 #: fish/setenv.c:34
 #, c-format
 msgid "use '%s VAR value' to set an environment variable\n"
-msgstr ""
+msgstr "gebruik '%s VAR waarde' om een omgevingsvariabele in te stellen\n"
 
 #: fish/setenv.c:56
 #, c-format
 msgid "use '%s VAR' to unset an environment variable\n"
-msgstr ""
+msgstr "gebruik '%s VAR' om een omgevingsvariabele te verwijderen\n"
 
 #: fish/supported.c:66
 msgid "yes"
@@ -3167,16 +3177,38 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: Draai een redding shell op een virtuele machine\n"
+"Copyright (C) 2009-2010 Red Hat Inc.\n"
+"Gebruik:\n"
+"  %s [--opties] -d domnaam\n"
+"  %s [--opties] -a disk.img [-a disk.img ...]\n"
+"Opties:\n"
+"  -a|--add image       Voeg image toe\n"
+"  --append kernelopts  Voeg kernel opties toe\n"
+"  -c|--connect uri     Specificeer libvirt URI voor -d optie\n"
+"  -d|--domain guest    Voeg schijven van libvirt gast toe\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Toon korte hulp\n"
+"  -m|--memsize MB      Stel geheugengrootte in in megabytes\n"
+"  --network            Zet netwerk aan\n"
+"  -r|--ro              Alleen-lezen toegang\n"
+"  --selinux            Zet SELinux aan\n"
+"  --smp N              Zet SMP aan met N >= 2 virtuele CPU's\n"
+"  -v|--verbose         Breedsprakige boodschappen\n"
+"  -V|--version         Toon versie en sluit af\n"
+"  -w|--rw              Koppel alleen-lezen aan\n"
+"  -x                   Traceer libguestfs API aanroepen\n"
+"Voor meer informatie, zie de manpagina %s(1).\n"
 
 #: rescue/virt-rescue.c:162
 #, c-format
 msgid "%s: could not parse --smp parameter '%s'\n"
-msgstr ""
+msgstr "%s: kon --smp parameter '%s' niet ontleden\n"
 
 #: rescue/virt-rescue.c:167
 #, c-format
 msgid "%s: --smp parameter '%s' should be >= 1\n"
-msgstr ""
+msgstr "%s: --smp parameter '%s' moet >= 1 zijn\n"
 
 #: rescue/virt-rescue.c:195
 #, c-format
@@ -3390,6 +3422,12 @@ msgid ""
 "If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\n"
 "environment variable.  There may also be errors printed above."
 msgstr ""
+"commando mislukte: %s\n"
+"\n"
+"Als qemu zich op een niet standaard pad bevindt, probeer dan de "
+"LIBGUESTFS_QEMU\n"
+"omgevingsvariabele in te stellen.  Er kunnen hierboven ook fouten afgedrukt "
+"worden."
 
 #: src/launch.c:1318
 msgid "qemu has not been launched yet"
diff --git a/po/or.po b/po/or.po
index 16603542..a29e2f97 100644
--- a/po/or.po
+++ b/po/or.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
 "Language: or\n"
@@ -556,24 +556,20 @@ msgid "add qemu parameters"
 msgstr "qemu ପ୍ରାଚଳଗୁଡ଼ିକୁ ଯୋଗକରନ୍ତୁ"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd ବ୍ୟବହାର କରି ଉତ୍ସରୁ ଲକ୍ଷ୍ୟସ୍ଥଳକୁ ନକଲ କରନ୍ତୁ"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd ବ୍ୟବହାର କରି ଉତ୍ସରୁ ଲକ୍ଷ୍ୟସ୍ଥଳକୁ ନକଲ କରନ୍ତୁ"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd ବ୍ୟବହାର କରି ଉତ୍ସରୁ ଲକ୍ଷ୍ୟସ୍ଥଳକୁ ନକଲ କରନ୍ତୁ"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd ବ୍ୟବହାର କରି ଉତ୍ସରୁ ଲକ୍ଷ୍ୟସ୍ଥଳକୁ ନକଲ କରନ୍ତୁ"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1338,9 +1334,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ଗୋଟିଏ ଖାଲି ବିଭାଜନ ସାରଣୀ ପ୍ରସ୍ତୁତ କରନ୍ତୁ"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/pa.po b/po/pa.po
index f75594eb..8c31369d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
@@ -628,24 +628,20 @@ msgid "add qemu parameters"
 msgstr "qemu ਪੈਰਾਮੀਟਰ ਜੋੜੋ"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd ਵਰਤ ਕੇ ਸਰੋਤ ਤੋਂ ਨੀਯਤ ਤੇ ਨਕਲ ਕਰੋ"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd ਵਰਤ ਕੇ ਸਰੋਤ ਤੋਂ ਨੀਯਤ ਤੇ ਨਕਲ ਕਰੋ"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd ਵਰਤ ਕੇ ਸਰੋਤ ਤੋਂ ਨੀਯਤ ਤੇ ਨਕਲ ਕਰੋ"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd ਵਰਤ ਕੇ ਸਰੋਤ ਤੋਂ ਨੀਯਤ ਤੇ ਨਕਲ ਕਰੋ"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -680,9 +676,8 @@ msgid "debug the QEMU command line (internal use only)"
 msgstr "QEMU ਕਮਾਂਡ ਲਾਈਨ ਡੀਬੱਗ ਕਰੋ (ਸਿਰਫ ਅੰਦਰੂਨੀ ਵਰਤੋਂ)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr "QEMU ਕਮਾਂਡ ਲਾਈਨ ਡੀਬੱਗ ਕਰੋ (ਸਿਰਫ ਅੰਦਰੂਨੀ ਵਰਤੋਂ)"
+msgstr ""
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -1411,9 +1406,8 @@ msgid "convert partition name to device name"
 msgstr "ਭਾਗ ਨਾਂ ਨੂੰ ਜੰਤਰ ਨਾਂ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ਭਾਗ ਨਾਂ ਨੂੰ ਜੰਤਰ ਨਾਂ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/pl.po b/po/pl.po
index 644f6552..02ced297 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
 "Language: pl\n"
@@ -48,6 +48,22 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: sprawdza wyrównanie partycji maszyny wirtualnej\n"
+"Copyright (C) 2011 Red Hat Inc.\n"
+"Użycie:\n"
+"  %s [--opcje] -d nazwa_dom\n"
+"  %s [--opcje] -a dysk.img [-a dysk.img...]\n"
+"Opcje:\n"
+"  -a|--add image       Dodaje obraz\n"
+"  -c|--connect uri     Określa adres URI biblioteki libvirt dla opcji -d\n"
+"  -d|--domain gość     Dodaje dyski z gościa libvirt\n"
+"  --format[=raw|..]    Wymusza format dysku dla opcji -a\n"
+"  --help               Wyświetla krótką pomoc\n"
+"  -q|--quiet           Bez wyświetlania, tylko kod wyjścia\n"
+"  -v|--verbose         Więcej komunikatów\n"
+"  -V|--version         Wyświetla wersję i kończy działanie\n"
+"  -x                   Śledzi wywołania API biblioteki libguestfs\n"
+"Aby dowiedzieć się więcej, należy zobaczyć stronę podręcznika %s(1).\n"
 
 #: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
 #: cat/virt-ls.c:192 df/domains.c:429 df/main.c:136 edit/virt-edit.c:141
@@ -67,11 +83,11 @@ msgstr "%s: nieznana długa opcja: %s (%d)\n"
 
 #: align/scan.c:269
 msgid "alignment < 4K"
-msgstr ""
+msgstr "wyrównanie < 4K"
 
 #: align/scan.c:274
 msgid "alignment < 64K"
-msgstr ""
+msgstr "wyrównanie < 64K"
 
 #: cat/virt-cat.c:65
 #, c-format
@@ -679,35 +695,31 @@ msgstr "wykonuje polecenie, zwracając wiersze"
 
 #: fish/cmds.c:2775
 msgid "output compressed device"
-msgstr ""
+msgstr "wyświetla skompresowane urządzenie"
 
 #: fish/cmds.c:2776
 msgid "output compressed file"
-msgstr ""
+msgstr "wyświetla skompresowany plik"
 
 #: fish/cmds.c:2777
 msgid "add qemu parameters"
 msgstr "dodaje parametry QEMU"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "kopiuje ze źródła do celu używając dd"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "kopiuje ze źródła do celu używając dd"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "kopiuje ze źródła do celu używając dd"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "kopiuje ze źródła do celu używając dd"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -742,9 +754,8 @@ msgid "debug the QEMU command line (internal use only)"
 msgstr "debuguje wiersz poleceń QEMU (tylko do użytku wewnętrznego)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr "debuguje wiersz poleceń QEMU (tylko do użytku wewnętrznego)"
+msgstr "debuguje napędy (tylko do użytku wewnętrznego)"
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -916,7 +927,7 @@ msgstr "uzyskuje flagę włączenia SELinuksa"
 
 #: fish/cmds.c:2836
 msgid "get number of virtual CPUs in appliance"
-msgstr ""
+msgstr "uzyskuje liczbę wirtualnych procesorów w przyrządzie"
 
 #: fish/cmds.c:2837
 msgid "get the current state"
@@ -956,7 +967,7 @@ msgstr "rozwija wieloznaczniki w ścieżkach"
 
 #: fish/cmds.c:2848
 msgid "install GRUB 1"
-msgstr ""
+msgstr "instaluje program GRUB 1"
 
 #: fish/cmds.c:2849
 msgid "return first 10 lines of a file"
@@ -1483,9 +1494,8 @@ msgid "convert partition name to device name"
 msgstr "konwertuje nazwę partycji na nazwę urządzenia"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "konwertuje nazwę partycji na nazwę urządzenia"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
@@ -1655,7 +1665,7 @@ msgstr ""
 
 #: fish/cmds.c:3033
 msgid "set number of virtual CPUs in appliance"
-msgstr ""
+msgstr "ustawia liczbę wirtualnych procesorów w przyrządzie"
 
 #: fish/cmds.c:3034
 msgid "enable or disable command traces"
@@ -1671,7 +1681,7 @@ msgstr "ustawia kontekst bezpieczeństwa SELinuksa"
 
 #: fish/cmds.c:3037
 msgid "set an environment variable"
-msgstr ""
+msgstr "ustawia zmienną środowiskową"
 
 #: fish/cmds.c:3039 fish/cmds.c:3040
 msgid "create partitions on a block device"
@@ -1819,7 +1829,7 @@ msgstr "odmontowuje wszystkie systemy plików"
 
 #: fish/cmds.c:3079
 msgid "unset an environment variable"
-msgstr ""
+msgstr "usuwa ustawienie zmiennej środowiskowej"
 
 #: fish/cmds.c:3080
 msgid "upload a file from the local machine"
@@ -2493,7 +2503,7 @@ msgstr ""
 #: fish/fish.c:1197
 #, c-format
 msgid "%s:%d: libguestfs: error: %s\n"
-msgstr ""
+msgstr "%s:%d: libguestfs: błąd: %s\n"
 
 #: fish/fish.c:1353
 #, c-format
@@ -2848,12 +2858,12 @@ msgstr "reopen: guestfs_create: utworzenie programu obsługi nie powiodło się\
 #: fish/setenv.c:34
 #, c-format
 msgid "use '%s VAR value' to set an environment variable\n"
-msgstr ""
+msgstr "używa \"%s VAR wartość\", aby ustawić zmienną środowiskową\n"
 
 #: fish/setenv.c:56
 #, c-format
 msgid "use '%s VAR' to unset an environment variable\n"
-msgstr ""
+msgstr "używa \"%s VAR\", aby usunąć ustawienie zmiennej środowiskowej\n"
 
 #: fish/supported.c:66
 msgid "yes"
@@ -3186,16 +3196,38 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: uruchamia powłokę ratunkową w maszynie wirtualnej\n"
+"Copyright (C) 2009-2010 Red Hat Inc.\n"
+"Użycie:\n"
+"  %s [--opcje] -d nazwa_domeny\n"
+"  %s [--opcje] -a dysk.img [-a dysk.img...]\n"
+"Opcje:\n"
+"  -a|--add obraz       Dodaje obraz\n"
+"  --append opcje_jądra Dołącza opcje jądra\n"
+"  -c|--connect uri     Określa adres URI biblioteki libvirt dla opcji -d\n"
+"  -d|--domain gość     Dodaje dysku z gościa biblioteki libvirt\n"
+"  --format[=raw|..]    Wymusza format dysku dla opcji -a\n"
+"  --help               Wyświetla krótką pomoc\n"
+"  -m|--memsize MB      Ustawia rozmiar pamięci w megabajtach\n"
+"  --network            Włącza sieć\n"
+"  -r|--ro              Dostęp tylko do odczytu\n"
+"  --selinux            Włącza SELinuksa\n"
+"  --smp N              Włącza SMP za pomocą N >= 2 wirtualnych procesorów\n"
+"  -v|--verbose         Więcej komunikatów\n"
+"  -V|--version         Wyświetla wersję i kończy działanie\n"
+"  -w|--rw              Montuje do odczytu i zapisu\n"
+"  -x                   Śledzi wywołania API biblioteki libguestfs\n"
+"Aby dowiedzieć się więcej, należy zobaczyć stronę podręcznika %s(1).\n"
 
 #: rescue/virt-rescue.c:162
 #, c-format
 msgid "%s: could not parse --smp parameter '%s'\n"
-msgstr ""
+msgstr "%s: nie można przetworzyć parametru \"%s\" opcji --smp\n"
 
 #: rescue/virt-rescue.c:167
 #, c-format
 msgid "%s: --smp parameter '%s' should be >= 1\n"
-msgstr ""
+msgstr "%s: parametr \"%s\" opcji --smp powinien wynosić >= 1\n"
 
 #: rescue/virt-rescue.c:195
 #, c-format
@@ -3419,6 +3451,11 @@ msgid ""
 "If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\n"
 "environment variable.  There may also be errors printed above."
 msgstr ""
+"polecenie nie powiodło się: %s\n"
+"\n"
+"Jeśli qemu jest położone w niestandardowej ścieżce, to należy spróbować\n"
+"ustawienia zmiennej środowiskowej LIBGUESTFS_QEMU. Powyżej mogą zostać\n"
+"wyświetlone błędy."
 
 #: src/launch.c:1318
 msgid "qemu has not been launched yet"
diff --git a/po/ta.po b/po/ta.po
index 3c98e67e..919deee0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
 "Language: ta\n"
@@ -556,24 +556,20 @@ msgid "add qemu parameters"
 msgstr "qemu அளவுருக்களை சேர்"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "ddஐ பயன்படுத்தும் இலக்கை மூலத்திலிருந்து நகலெடு"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "ddஐ பயன்படுத்தும் இலக்கை மூலத்திலிருந்து நகலெடு"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "ddஐ பயன்படுத்தும் இலக்கை மூலத்திலிருந்து நகலெடு"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "ddஐ பயன்படுத்தும் இலக்கை மூலத்திலிருந்து நகலெடு"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1339,9 +1335,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ஒரு காலி பகிர்வு அட்டவணையை உருவாக்கு"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/te.po b/po/te.po
index c2338cd2..f6b7260a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
 "Language: te\n"
@@ -556,24 +556,20 @@ msgid "add qemu parameters"
 msgstr "qemu పారామితులను జతచేయుము"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "dd వుపయోగించి మూలమునుండి గమ్యమునకు నకలుతీయుము"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "dd వుపయోగించి మూలమునుండి గమ్యమునకు నకలుతీయుము"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "dd వుపయోగించి మూలమునుండి గమ్యమునకు నకలుతీయుము"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "dd వుపయోగించి మూలమునుండి గమ్యమునకు నకలుతీయుము"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -1338,9 +1334,8 @@ msgid "convert partition name to device name"
 msgstr ""
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "ఖాళీ విభజన పట్టికను సృష్టించుము"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
diff --git a/po/uk.po b/po/uk.po
index 45866503..3e77eed7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
 "POT-Creation-Date: 2011-10-26 21:10+0100\n"
-"PO-Revision-Date: 2011-10-19 15:44+0000\n"
+"PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
 "Language: uk\n"
@@ -47,6 +47,22 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: перевірка вирівнювання розділів віртуальної машини\n"
+"© Red Hat Inc., 2011\n"
+"Використання:\n"
+"  %s [--параметри] -d назва_домену\n"
+"  %s [--параметри] -a диск.img [-a диск.img ...]\n"
+"Параметри:\n"
+"  -a|--add образ       Додати образ\n"
+"  -c|--connect uri     Вказати адресу libvirt для параметра -d\n"
+"  -d|--domain гість    Додати диски з гостьової системи libvirt\n"
+"  --format[=raw|..]    Вказати формат диска для параметра -a\n"
+"  --help               Показати коротку довідку\n"
+"  -q|--quiet           Не виводити повідомлень, лише код виходу\n"
+"  -v|--verbose         Режим докладних повідомлень\n"
+"  -V|--version         Показати дані щодо версії і завершити роботу\n"
+"  -x                   Трасувати виклики API libguestfs\n"
+"З докладнішими даними можна ознайомитися на сторінці довідника (man) %s(1).\n"
 
 #: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
 #: cat/virt-ls.c:192 df/domains.c:429 df/main.c:136 edit/virt-edit.c:141
@@ -66,11 +82,11 @@ msgstr "%s: невідомий довгий запис параметра: %s (%
 
 #: align/scan.c:269
 msgid "alignment < 4K"
-msgstr ""
+msgstr "вирівнювання < 4кБ"
 
 #: align/scan.c:274
 msgid "alignment < 64K"
-msgstr ""
+msgstr "вирівнювання < 64кБ"
 
 #: cat/virt-cat.c:65
 #, c-format
@@ -686,35 +702,31 @@ msgstr "виконати команду, повернути виведені р�
 
 #: fish/cmds.c:2775
 msgid "output compressed device"
-msgstr ""
+msgstr "вивести на пристрій зі стисканням"
 
 #: fish/cmds.c:2776
 msgid "output compressed file"
-msgstr ""
+msgstr "вивести до файла зі стисканням"
 
 #: fish/cmds.c:2777
 msgid "add qemu parameters"
 msgstr "додати параметри qemu"
 
 #: fish/cmds.c:2778
-#, fuzzy
 msgid "copy from source device to destination device"
-msgstr "копіювати з джерела до призначення за допомогою dd"
+msgstr ""
 
 #: fish/cmds.c:2779
-#, fuzzy
 msgid "copy from source device to destination file"
-msgstr "копіювати з джерела до призначення за допомогою dd"
+msgstr ""
 
 #: fish/cmds.c:2780
-#, fuzzy
 msgid "copy from source file to destination device"
-msgstr "копіювати з джерела до призначення за допомогою dd"
+msgstr ""
 
 #: fish/cmds.c:2781
-#, fuzzy
 msgid "copy from source file to destination file"
-msgstr "копіювати з джерела до призначення за допомогою dd"
+msgstr ""
 
 #: fish/cmds.c:2782
 msgid "copy local files or directories into an image"
@@ -752,11 +764,8 @@ msgstr ""
 "використання)"
 
 #: fish/cmds.c:2790
-#, fuzzy
 msgid "debug the drives (internal use only)"
-msgstr ""
-"виконати діагностичну перевірку командного рядка QEMU (лише для внутрішнього "
-"використання)"
+msgstr "діагностика дисків (лише для внутрішнього використання)"
 
 #: fish/cmds.c:2791
 msgid "upload a file to the appliance (internal use only)"
@@ -928,7 +937,7 @@ msgstr "отримати значення прапорця вмикання SELi
 
 #: fish/cmds.c:2836
 msgid "get number of virtual CPUs in appliance"
-msgstr ""
+msgstr "отримати дані щодо кількості віртуальних процесорів на пристрої"
 
 #: fish/cmds.c:2837
 msgid "get the current state"
@@ -968,7 +977,7 @@ msgstr "розгорнути адресу каталогу з шаблонами
 
 #: fish/cmds.c:2848
 msgid "install GRUB 1"
-msgstr ""
+msgstr "встановити GRUB 1"
 
 #: fish/cmds.c:2849
 msgid "return first 10 lines of a file"
@@ -1508,9 +1517,8 @@ msgid "convert partition name to device name"
 msgstr "перетворити назву розділу на назву пристрою"
 
 #: fish/cmds.c:2989
-#, fuzzy
 msgid "convert partition name to partition number"
-msgstr "перетворити назву розділу на назву пристрою"
+msgstr ""
 
 #: fish/cmds.c:2990
 msgid "ping the guest daemon"
@@ -1681,7 +1689,7 @@ msgstr ""
 
 #: fish/cmds.c:3033
 msgid "set number of virtual CPUs in appliance"
-msgstr ""
+msgstr "встановити кількість віртуальних процесорів на пристрої"
 
 #: fish/cmds.c:3034
 msgid "enable or disable command traces"
@@ -1697,7 +1705,7 @@ msgstr "встановити значення контексту захисту
 
 #: fish/cmds.c:3037
 msgid "set an environment variable"
-msgstr ""
+msgstr "встановити змінну середовища"
 
 #: fish/cmds.c:3039 fish/cmds.c:3040
 msgid "create partitions on a block device"
@@ -1849,7 +1857,7 @@ msgstr "демонтувати всі файлові системи"
 
 #: fish/cmds.c:3079
 msgid "unset an environment variable"
-msgstr ""
+msgstr "скасувати визначення змінної середовища"
 
 #: fish/cmds.c:3080
 msgid "upload a file from the local machine"
@@ -2527,7 +2535,7 @@ msgstr ""
 #: fish/fish.c:1197
 #, c-format
 msgid "%s:%d: libguestfs: error: %s\n"
-msgstr ""
+msgstr "%s:%d: libguestfs: помилка: %s\n"
 
 #: fish/fish.c:1353
 #, c-format
@@ -2889,11 +2897,15 @@ msgstr "reopen: guestfs_create: не вдалося створити елеме�
 #, c-format
 msgid "use '%s VAR value' to set an environment variable\n"
 msgstr ""
+"скористайтеся командою «%s ЗМІННА значення» для встановлення змінної "
+"середовища\n"
 
 #: fish/setenv.c:56
 #, c-format
 msgid "use '%s VAR' to unset an environment variable\n"
 msgstr ""
+"скористайтеся командою «%s ЗМІННА», щоб скасувати визначення змінної "
+"середовища\n"
 
 #: fish/supported.c:66
 msgid "yes"
@@ -3228,16 +3240,38 @@ msgid ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
+"%s: запуск оболонки відновлення на віртуальній машині\n"
+"© Red Hat Inc., 2009–2010\n"
+"Використання:\n"
+"  %s [--параметри] -d назва-домену\n"
+"  %s [--параметри] -a диск.img [-a диск.img ...]\n"
+"Параметри:\n"
+"  -a|--add образ       Додати образ\n"
+"  --append пар_ядра    Додати параметри запуску ядра\n"
+"  -c|--connect адреса  Вказати адресу libvirt для параметра -d\n"
+"  -d|--domain гість    Додати диски з гостьової системи libvirt\n"
+"  --format[=raw|..]    Вказати формат диска для параметра -a\n"
+"  --help               Показати коротку довідку\n"
+"  -m|--memsize МБ      Вказати розмір пам’яті у мегабайтах\n"
+"  --network            Увімкнути мережу\n"
+"  -r|--ro              Доступ у режимі лише читання\n"
+"  --selinux            Увімкнути SELinux\n"
+"  --smp N              Увімкнути SMP з N >= 2 віртуальних процесорів\n"
+"  -v|--verbose         Докладні повідомлення\n"
+"  -V|--version         Показати дані щодо версії і завершити роботу\n"
+"  -w|--rw              Змонтувати у режимі читання-запису\n"
+"  -x                   Трасувати виклики програмного інтерфейсу libguestfs\n"
+"Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
 #: rescue/virt-rescue.c:162
 #, c-format
 msgid "%s: could not parse --smp parameter '%s'\n"
-msgstr ""
+msgstr "%s: не вдалося обробити параметр --smp «%s»\n"
 
 #: rescue/virt-rescue.c:167
 #, c-format
 msgid "%s: --smp parameter '%s' should be >= 1\n"
-msgstr ""
+msgstr "%s: значенням параметра --smp «%s» має бути число >= 1\n"
 
 #: rescue/virt-rescue.c:195
 #, c-format
@@ -3460,6 +3494,11 @@ msgid ""
 "If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\n"
 "environment variable.  There may also be errors printed above."
 msgstr ""
+"помилка команди: %s\n"
+"\n"
+"Якщо qemu зберігається у нестандартному каталозі, спробуйте\n"
+"встановити відповідне значення змінної середовища LIBGUESTFS_QEMU.\n"
+"Крім того, вище можна знайти повідомлення про помилки."
 
 #: src/launch.c:1318
 msgid "qemu has not been launched yet"