From: Richard W.M. Jones Date: Thu, 27 Oct 2011 15:06:44 +0000 (+0100) Subject: Version 1.15.0. X-Git-Tag: 1.15.0^0 X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=477c437ba0e2108413fe2b54a830b36c251242f3 Version 1.15.0. --- diff --git a/BUGS b/BUGS index d1f9e20..a257089 100644 --- a/BUGS +++ b/BUGS @@ -1,5 +1,5 @@ NOTE: This file is automatically generated from "update-bugs.sh". -Last updated: 2011-10-26 +Last updated: 2011-10-27 This contains a local list of the bugs that are open against libguestfs. Bugs are tracked in the Red Hat Bugzilla database diff --git a/configure.ac b/configure.ac index 8d10cf0..cda17a9 100644 --- a/configure.ac +++ b/configure.ac @@ -19,8 +19,8 @@ # add extra information using --with-extra="..." which may be any # freeform string. m4_define([libguestfs_major], [1]) -m4_define([libguestfs_minor], [13]) -m4_define([libguestfs_release], [26]) +m4_define([libguestfs_minor], [15]) +m4_define([libguestfs_release], [0]) AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/po-docs/ja.po b/po-docs/ja.po index 00f6abd..744b652 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 , 2011. # , 2011. msgid "" msgstr "" "Project-Id-Version: libguestfs\n" -"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/\n" -"POT-Creation-Date: 2011-10-26 21:10+0200\n" +"Report-Msgid-Bugs-To: libguestfs@redhat.com\n" +"POT-Creation-Date: 2011-10-27 16:05+0200\n" "PO-Revision-Date: 2011-10-27 09:15+0000\n" "Last-Translator: rjones \n" "Language-Team: Japanese \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" +"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" 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,19 +700,21 @@ 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 #: ../align/virt-alignment-scan.pod:232 -msgid "For a typical hard drive with 512 byte sectors:" +msgid "For a typical consumer hard drive with 512 byte sectors:" msgstr "" #. type: verbatim #: ../align/virt-alignment-scan.pod:234 #, no-wrap msgid "" +" $ cat /sys/block/sda/queue/hw_sector_size\n" +" 512\n" " $ cat /sys/block/sda/queue/physical_block_size\n" " 512\n" " $ cat /sys/block/sda/queue/logical_block_size\n" @@ -725,12 +727,34 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:243 +#: ../align/virt-alignment-scan.pod:245 +msgid "For a new consumer hard drive with 4Kbyte sectors:" +msgstr "" + +#. type: verbatim +#: ../align/virt-alignment-scan.pod:247 +#, no-wrap +msgid "" +" $ cat /sys/block/sda/queue/hw_sector_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/physical_block_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/logical_block_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/minimum_io_size\n" +" 4096\n" +" $ cat /sys/block/sda/queue/optimal_io_size\n" +" 0\n" +"\n" +msgstr "" + +#. type: textblock +#: ../align/virt-alignment-scan.pod:258 msgid "For a NetApp LUN:" msgstr "" #. type: verbatim -#: ../align/virt-alignment-scan.pod:245 +#: ../align/virt-alignment-scan.pod:260 #, no-wrap msgid "" " $ cat /sys/block/sdc/queue/logical_block_size\n" @@ -745,72 +769,71 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:254 +#: ../align/virt-alignment-scan.pod:269 msgid "" "The NetApp allows 512 byte accesses (but they will be very inefficient), " "prefers a minimum 4K I/O size, but the optimal I/O size is 64K." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:258 +#: ../align/virt-alignment-scan.pod:273 msgid "" -"For detailed information about what these numbers mean, see " -"L" +"For detailed information about what these numbers mean, see L" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:261 +#: ../align/virt-alignment-scan.pod:276 msgid "" -"[Thanks to Mike Snitzer for providing NetApp data and additional " -"information.]" +"[Thanks to Matt Booth for providing 4K drive data. Thanks to Mike Snitzer " +"for providing NetApp data and additional information.]" msgstr "" #. type: =head2 -#: ../align/virt-alignment-scan.pod:264 +#: ../align/virt-alignment-scan.pod:279 msgid "1 MB PARTITION ALIGNMENT" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:266 +#: ../align/virt-alignment-scan.pod:281 msgid "" "Microsoft picked 1 MB as the default alignment for all partitions starting " "with Windows 2008 Server, and Linux has followed this." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:269 +#: ../align/virt-alignment-scan.pod:284 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 -#: ../align/virt-alignment-scan.pod:273 +#: ../align/virt-alignment-scan.pod:288 msgid "" "1 MB alignment is compatible with all current alignment requirements (4K, " "64K) and provides room for future growth in physical block sizes." msgstr "" #. type: =head2 -#: ../align/virt-alignment-scan.pod:276 +#: ../align/virt-alignment-scan.pod:291 msgid "SETTING ALIGNMENT" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:278 +#: ../align/virt-alignment-scan.pod:293 msgid "" -"L 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 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 -#: ../align/virt-alignment-scan.pod:284 +#: ../align/virt-alignment-scan.pod:299 msgid "" "Another way to correct partition alignment problems is to reinstall your " "guest operating systems. If you install operating systems from templates, " @@ -818,23 +841,23 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:288 +#: ../align/virt-alignment-scan.pod:303 msgid "" -"For older versions of Windows, the following NetApp document contains useful" -" information: L" +"For older versions of Windows, the following NetApp document contains useful " +"information: L" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:291 +#: ../align/virt-alignment-scan.pod:306 msgid "" "For Red Hat Enterprise Linux E 5, use a Kickstart script that contains " -"an explicit C<%pre> section that creates aligned partitions using " -"L. Do not use the Kickstart C command. The NetApp " -"document above contains an example." +"an explicit C<%pre> section that creates aligned partitions using L. Do not use the Kickstart C command. The NetApp document above " +"contains an example." msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:296 ../cat/virt-cat.pod:231 +#: ../align/virt-alignment-scan.pod:311 ../cat/virt-cat.pod:231 #: ../cat/virt-filesystems.pod:373 ../cat/virt-ls.pod:483 #: ../clone/virt-sysprep.pod:475 ../df/virt-df.pod:215 #: ../edit/virt-edit.pod:342 ../inspector/virt-inspector.pod:352 @@ -846,7 +869,7 @@ msgid "SHELL QUOTING" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:298 ../cat/virt-cat.pod:233 +#: ../align/virt-alignment-scan.pod:313 ../cat/virt-cat.pod:233 #: ../cat/virt-filesystems.pod:375 ../cat/virt-ls.pod:485 #: ../clone/virt-sysprep.pod:477 ../df/virt-df.pod:217 #: ../edit/virt-edit.pod:344 ../inspector/virt-inspector.pod:354 @@ -857,12 +880,12 @@ 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 for details." +"escape these characters on the command line. See the shell manual page L for details." msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:303 ../cat/virt-cat.pod:238 +#: ../align/virt-alignment-scan.pod:318 ../cat/virt-cat.pod:238 #: ../cat/virt-filesystems.pod:380 ../cat/virt-ls.pod:490 #: ../clone/virt-sysprep.pod:482 ../df/virt-df.pod:222 #: ../edit/virt-edit.pod:349 ../fish/guestfish.pod:1114 @@ -873,13 +896,13 @@ msgid "EXIT STATUS" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:305 +#: ../align/virt-alignment-scan.pod:320 msgid "This program returns:" msgstr "" #. type: =item -#: ../align/virt-alignment-scan.pod:309 ../align/virt-alignment-scan.pod:315 -#: ../align/virt-alignment-scan.pod:321 ../align/virt-alignment-scan.pod:328 +#: ../align/virt-alignment-scan.pod:324 ../align/virt-alignment-scan.pod:330 +#: ../align/virt-alignment-scan.pod:336 ../align/virt-alignment-scan.pod:343 #: ../cat/virt-cat.pod:177 ../cat/virt-cat.pod:182 ../cat/virt-cat.pod:187 #: ../cat/virt-cat.pod:198 ../cat/virt-cat.pod:202 #: ../clone/virt-sysprep.pod:283 ../clone/virt-sysprep.pod:287 @@ -923,19 +946,19 @@ msgstr "" #: ../src/guestfs-actions.pod:22 ../src/guestfs-actions.pod:29 #: ../src/guestfs-actions.pod:641 ../src/guestfs-actions.pod:649 #: ../src/guestfs-actions.pod:656 ../src/guestfs-actions.pod:663 -#: ../src/guestfs-actions.pod:2071 ../src/guestfs-actions.pod:2075 #: ../src/guestfs-actions.pod:2079 ../src/guestfs-actions.pod:2083 -#: ../src/guestfs-actions.pod:2091 ../src/guestfs-actions.pod:2095 -#: ../src/guestfs-actions.pod:2099 ../src/guestfs-actions.pod:2109 -#: ../src/guestfs-actions.pod:2113 ../src/guestfs-actions.pod:2117 -#: ../src/guestfs-actions.pod:2255 ../src/guestfs-actions.pod:2259 -#: ../src/guestfs-actions.pod:2264 ../src/guestfs-actions.pod:2269 -#: ../src/guestfs-actions.pod:2330 ../src/guestfs-actions.pod:2334 -#: ../src/guestfs-actions.pod:2339 ../src/guestfs-actions.pod:2754 -#: ../src/guestfs-actions.pod:2761 ../src/guestfs-actions.pod:2768 -#: ../src/guestfs-actions.pod:3313 ../src/guestfs-actions.pod:3319 -#: ../src/guestfs-actions.pod:3327 ../src/guestfs-actions.pod:3334 -#: ../src/guestfs-actions.pod:3341 ../src/guestfs.pod:403 +#: ../src/guestfs-actions.pod:2087 ../src/guestfs-actions.pod:2091 +#: ../src/guestfs-actions.pod:2099 ../src/guestfs-actions.pod:2103 +#: ../src/guestfs-actions.pod:2107 ../src/guestfs-actions.pod:2117 +#: ../src/guestfs-actions.pod:2121 ../src/guestfs-actions.pod:2125 +#: ../src/guestfs-actions.pod:2263 ../src/guestfs-actions.pod:2267 +#: ../src/guestfs-actions.pod:2272 ../src/guestfs-actions.pod:2277 +#: ../src/guestfs-actions.pod:2338 ../src/guestfs-actions.pod:2342 +#: ../src/guestfs-actions.pod:2347 ../src/guestfs-actions.pod:2762 +#: ../src/guestfs-actions.pod:2769 ../src/guestfs-actions.pod:2776 +#: ../src/guestfs-actions.pod:3321 ../src/guestfs-actions.pod:3327 +#: ../src/guestfs-actions.pod:3335 ../src/guestfs-actions.pod:3342 +#: ../src/guestfs-actions.pod:3349 ../src/guestfs.pod:403 #: ../src/guestfs.pod:408 ../src/guestfs.pod:413 ../src/guestfs.pod:417 #: ../src/guestfs.pod:422 ../src/guestfs.pod:426 ../src/guestfs.pod:431 #: ../src/guestfs.pod:436 ../src/guestfs.pod:1109 ../src/guestfs.pod:1113 @@ -959,52 +982,52 @@ msgid "*" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:311 +#: ../align/virt-alignment-scan.pod:326 msgid "0" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:313 +#: ../align/virt-alignment-scan.pod:328 msgid "" "successful exit, all partitions are aligned E 64K for best performance" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:317 +#: ../align/virt-alignment-scan.pod:332 msgid "1" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:319 +#: ../align/virt-alignment-scan.pod:334 msgid "an error scanning the disk image or guest" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:323 +#: ../align/virt-alignment-scan.pod:338 msgid "2" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:325 +#: ../align/virt-alignment-scan.pod:340 msgid "" "successful exit, some partitions have alignment E 64K which can result " "in poor performance on high end network storage" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:330 +#: ../align/virt-alignment-scan.pod:345 msgid "3" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:332 +#: ../align/virt-alignment-scan.pod:347 msgid "" -"successful exit, some partitions have alignment E 4K which can result in" -" poor performance on most hypervisors" +"successful exit, some partitions have alignment E 4K which can result in " +"poor performance on most hypervisors" msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:337 ../cat/virt-cat.pod:243 +#: ../align/virt-alignment-scan.pod:352 ../cat/virt-cat.pod:243 #: ../cat/virt-filesystems.pod:385 ../cat/virt-ls.pod:495 #: ../clone/virt-sysprep.pod:486 ../df/virt-df.pod:227 #: ../edit/virt-edit.pod:354 ../erlang/examples/guestfs-erlang.pod:97 @@ -1025,14 +1048,14 @@ msgid "SEE ALSO" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:339 +#: ../align/virt-alignment-scan.pod:354 msgid "" -"L, L, L, L, L" -", L." +"L, L, L, L, " +"L, L." msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:346 ../cat/virt-cat.pod:252 +#: ../align/virt-alignment-scan.pod:361 ../cat/virt-cat.pod:252 #: ../cat/virt-filesystems.pod:396 ../cat/virt-ls.pod:507 #: ../clone/virt-sysprep.pod:501 ../df/virt-df.pod:235 #: ../edit/virt-edit.pod:368 ../rescue/virt-rescue.pod:296 @@ -1044,7 +1067,7 @@ msgid "AUTHOR" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:348 ../cat/virt-cat.pod:254 +#: ../align/virt-alignment-scan.pod:363 ../cat/virt-cat.pod:254 #: ../cat/virt-filesystems.pod:398 ../cat/virt-ls.pod:509 #: ../clone/virt-sysprep.pod:503 ../df/virt-df.pod:237 #: ../edit/virt-edit.pod:370 ../inspector/virt-inspector.pod:395 @@ -1056,7 +1079,7 @@ msgid "Richard W.M. Jones L" msgstr "" #. type: =head1 -#: ../align/virt-alignment-scan.pod:350 ../cat/virt-cat.pod:256 +#: ../align/virt-alignment-scan.pod:365 ../cat/virt-cat.pod:256 #: ../cat/virt-filesystems.pod:400 ../cat/virt-ls.pod:511 #: ../clone/virt-sysprep.pod:505 ../df/virt-df.pod:239 #: ../edit/virt-edit.pod:372 ../erlang/examples/guestfs-erlang.pod:114 @@ -1077,13 +1100,13 @@ msgid "COPYRIGHT" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:352 ../clone/virt-sysprep.pod:507 +#: ../align/virt-alignment-scan.pod:367 ../clone/virt-sysprep.pod:507 #: ../sparsify/virt-sparsify.pod:270 msgid "Copyright (C) 2011 Red Hat Inc." msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:354 ../cat/virt-cat.pod:260 +#: ../align/virt-alignment-scan.pod:369 ../cat/virt-cat.pod:260 #: ../cat/virt-filesystems.pod:404 ../cat/virt-ls.pod:515 #: ../clone/virt-sysprep.pod:509 ../df/virt-df.pod:243 #: ../edit/virt-edit.pod:376 ../fish/guestfish.pod:1305 @@ -1103,7 +1126,7 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:359 ../cat/virt-cat.pod:265 +#: ../align/virt-alignment-scan.pod:374 ../cat/virt-cat.pod:265 #: ../cat/virt-filesystems.pod:409 ../cat/virt-ls.pod:520 #: ../clone/virt-sysprep.pod:514 ../df/virt-df.pod:248 #: ../edit/virt-edit.pod:381 ../fish/guestfish.pod:1310 @@ -1123,7 +1146,7 @@ msgid "" msgstr "" #. type: textblock -#: ../align/virt-alignment-scan.pod:364 ../cat/virt-cat.pod:270 +#: ../align/virt-alignment-scan.pod:379 ../cat/virt-cat.pod:270 #: ../cat/virt-filesystems.pod:414 ../cat/virt-ls.pod:525 #: ../clone/virt-sysprep.pod:519 ../df/virt-df.pod:253 #: ../edit/virt-edit.pod:386 ../fish/guestfish.pod:1315 @@ -1136,9 +1159,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 @@ -1195,8 +1218,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 @@ -1306,8 +1329,8 @@ msgstr "" #: ../inspector/virt-inspector.pod:67 ../rescue/virt-rescue.pod:96 msgid "" "Add I 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 @@ -1320,10 +1343,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 @@ -1354,8 +1377,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." +"Read key or passphrase parameters from stdin. The default is to try to read " +"passphrases from the user by opening C." msgstr "" #. type: =head1 @@ -1493,8 +1516,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 "" @@ -1526,8 +1549,8 @@ msgstr "" #. type: textblock #: ../cat/virt-cat.pod:245 msgid "" -"L, L, L, L, L" -", L." +"L, L, L, L, L, L." msgstr "" #. type: textblock @@ -1563,8 +1586,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 and L." +"and their sizes in a disk image or virtual machine. It is a replacement for " +"L and L." msgstr "" #. type: textblock @@ -1666,8 +1689,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 @@ -1684,8 +1707,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 @@ -1723,10 +1746,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 @@ -1780,8 +1803,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 @@ -1866,8 +1889,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 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 to match columns to data in external " "programs." msgstr "" @@ -1901,8 +1924,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 @@ -2021,8 +2044,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 is the second partition on the first" -" device." +"names, so that for example C is the second partition on the first " +"device." msgstr "" #. type: textblock @@ -2075,8 +2098,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" +"comprehensive list of partition types can be found here: L" msgstr "" #. type: textblock @@ -2105,9 +2128,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 @@ -2145,8 +2168,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 work reliably." -" This example has two columns:" +"Myth: Just split fields at commas. Reality: This does I work " +"reliably. This example has two columns:" msgstr "" #. type: verbatim @@ -2188,8 +2211,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 for Perl" -" or Python's built-in csv library)." +"For other languages, use a CSV processing library (eg. C for Perl " +"or Python's built-in csv library)." msgstr "" #. type: textblock @@ -2202,8 +2225,8 @@ msgstr "" #: ../cat/virt-filesystems.pod:387 msgid "" "L, L, L, L, L, L, L, " -"L." +"filesystems(1)>, L, L, L." msgstr "" #. type: textblock @@ -2263,23 +2286,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 can do many simple file listings. For more complicated cases you" -" may need to use L, or write a program directly to the " -"L API." +"C can do many simple file listings. For more complicated cases you " +"may need to use L, or write a program directly to the L API." msgstr "" #. type: textblock @@ -2394,8 +2417,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 @@ -2412,10 +2435,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 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 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 @@ -2529,8 +2552,8 @@ msgstr "" #. type: textblock #: ../cat/virt-ls.pod:132 msgid "" -"Most of the interesting features of C are only available when using" -" I<-lR> mode." +"Most of the interesting features of C are only available when using " +"I<-lR> mode." msgstr "" #. type: textblock @@ -2538,11 +2561,11 @@ msgstr "" msgid "" "The fields are normally space-separated. Filenames are B 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 to analyze the guest, they could play tricks" -" on you by creating filenames with embedded newline characters. To " -"B 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 to analyze the guest, they could play tricks " +"on you by creating filenames with embedded newline characters. To B " +"parse the output in another program, use the I<--csv> (Comma-Separated " +"Values) option." msgstr "" #. type: textblock @@ -2609,7 +2632,7 @@ msgid "" msgstr "" #. type: =head2 -#: ../cat/virt-ls.pod:181 ../fish/guestfish-actions.pod:4395 +#: ../cat/virt-ls.pod:181 ../fish/guestfish-actions.pod:4380 msgid "path" msgstr "" @@ -2798,8 +2821,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 "" @@ -2855,8 +2878,8 @@ msgstr "" #. type: textblock #: ../cat/virt-ls.pod:378 msgid "" -"C produces a \"long listing\", which shows more detail. See " -"L." +"C produces a \"long listing\", which shows more detail. See L." msgstr "" #. type: textblock @@ -2990,10 +3013,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 @@ -3008,16 +3031,15 @@ msgstr "" msgid "" "Virt-sysprep modifies the guest or disk image I. The guest must " "be shut down. If you want to preserve the existing contents of the guest, " -"you I. See L " -"below." +"you I. See L below." msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:29 msgid "" "You do I 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 "" @@ -3025,8 +3047,8 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:35 msgid "" -"\"Sysprep\" stands for \"system preparation\" tool. The name comes from the" -" Microsoft program C which is used to unconfigure Windows " +"\"Sysprep\" stands for \"system preparation\" tool. The name comes from the " +"Microsoft program C which is used to unconfigure Windows " "machines in preparation for cloning them. Having said that, virt-sysprep " "does I currently work on Microsoft Windows guests. We plan to support " "Windows sysprepping in a future version, and we already have code to do it." @@ -3137,8 +3159,8 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:135 msgid "" -"The default is to try to detect if SELinux relabelling is required. See " -"L below for more details." +"The default is to try to detect if SELinux relabelling is required. See L below for more details." msgstr "" #. type: =head1 @@ -3149,8 +3171,8 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:158 msgid "" -"If the I<--enable> option is I given, then I, although some are skipped depending on the type of guest." +"If the I<--enable> option is I given, then I, although some are skipped depending on the type of guest." msgstr "" #. type: textblock @@ -3171,8 +3193,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 @@ -3228,8 +3250,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." +"If the I<--hostname> parameter is not given, then the hostname is changed to " +"C." msgstr "" #. type: =head2 @@ -3272,8 +3294,7 @@ 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 @@ -3351,8 +3372,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 "" @@ -3516,8 +3537,8 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:349 msgid "" -"You can, of course, just copy the block device on the host using L or" -" L." +"You can, of course, just copy the block device on the host using L or " +"L." msgstr "" #. type: verbatim @@ -3552,23 +3573,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 (with the I option), L (I<--snapshot> option). Some " +"Tools that can do this include: L (with the I option), L (I<--snapshot> option). Some " "filesystems (such as btrfs) and most Network Attached Storage devices can " "also create cheap snapshots from files or LUNs." msgstr "" @@ -3591,9 +3612,9 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:396 msgid "" -"A separate tool, L, 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, 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 @@ -3620,8 +3641,8 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:409 msgid "" -"L can be used to make the cloning template smaller, making" -" it easier to compress and/or faster to copy." +"L can be used to make the cloning template smaller, making " +"it easier to compress and/or faster to copy." msgstr "" #. type: textblock @@ -3653,9 +3674,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 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 performs a copy and resize, and thus is ideal for cloning " +"guests from a template." msgstr "" #. type: =head1 @@ -3667,19 +3688,18 @@ 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" -" 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 " +"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" -" as one way to remove this content. See also the " -"L 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 as one way to remove this content. See also the L command to get rid of deleted content in directory entries and inodes." msgstr "" #. type: =head2 @@ -3737,10 +3757,10 @@ msgstr "" #. type: textblock #: ../clone/virt-sysprep.pod:464 msgid "" -"If any new files are created by virt-sysprep, then virt-sysprep touches " -"C 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 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 @@ -3766,8 +3786,8 @@ msgstr "" #: ../clone/virt-sysprep.pod:488 msgid "" "L, L, L, L, L, L, L, L, L, L, L, L." +"resize(1)>, L, L, L, L, L, L, L." msgstr "" #. type: textblock @@ -3827,20 +3847,20 @@ msgstr "" #. type: textblock #: ../df/virt-df.pod:28 msgid "" -"If used without any I<-a> or I<-d> arguments, C checks with libvirt" -" to get a list of all active and inactive guests, and performs a C-type " +"If used without any I<-a> or I<-d> arguments, C checks with libvirt " +"to get a list of all active and inactive guests, and performs a C-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 performs a " -"C-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 will I. If you want to run on multiple guests, then you have to " -"invoke C multiple times." +"If any I<-a> or I<-d> arguments are specified, C performs a C-" +"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 will I. If you want to run on multiple guests, then you have to invoke " +"C multiple times." msgstr "" #. type: textblock @@ -3944,8 +3964,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 "" @@ -3961,23 +3981,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, L, L, L, " -"L." +"L, L, L, L, L." msgstr "" #. type: textblock @@ -4051,8 +4071,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 "" @@ -4064,8 +4084,8 @@ msgstr "" #. type: textblock #: ../edit/virt-edit.pod:38 msgid "" -"For more complex cases you should look at the L tool (see " -"L below)." +"For more complex cases you should look at the L tool (see L below)." msgstr "" #. type: textblock @@ -4137,15 +4157,15 @@ msgstr "" #. type: textblock #: ../edit/virt-edit.pod:85 msgid "" -"Create a backup of the original file I. The backup" -" has the original filename with C added." +"Create a backup of the original file I. The backup " +"has the original filename with C added." msgstr "" #. type: textblock #: ../edit/virt-edit.pod:88 msgid "" -"Usually the first character of C would be a dot C<.> so you would" -" write:" +"Usually the first character of C would be a dot C<.> so you would " +"write:" msgstr "" #. type: verbatim @@ -4182,8 +4202,7 @@ 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 @@ -4216,8 +4235,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 @@ -4330,8 +4349,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 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 user account from the password file you can do:" msgstr "" #. type: verbatim @@ -4345,8 +4364,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." @@ -4362,18 +4381,18 @@ msgstr "" #. type: textblock #: ../edit/virt-edit.pod:240 msgid "" -"The return value from the expression is ignored, but the expression may call" -" C 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 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 @@ -4387,8 +4406,8 @@ msgstr "" #. type: textblock #: ../edit/virt-edit.pod:251 msgid "" -"Alternately, use the perl C function, being careful not to chomp " -"C<$_> itself (since that would remove all newlines from the file):" +"Alternately, use the perl C function, being careful not to chomp C<" +"$_> itself (since that would remove all newlines from the file):" msgstr "" #. type: verbatim @@ -4443,8 +4462,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 "" @@ -4510,8 +4529,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 @@ -4550,8 +4569,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." +"API and gives some examples. If you are not familiar with using libguestfs, " +"you also need to read L." msgstr "" #. type: =head2 @@ -4585,8 +4604,7 @@ msgstr "" #. type: textblock #: ../erlang/examples/guestfs-erlang.pod:33 -msgid "" -"C is the libguestfs handle which you should pass to other functions." +msgid "C is the libguestfs handle which you should pass to other functions." msgstr "" #. type: textblock @@ -4751,8 +4769,8 @@ msgstr "" #. type: textblock #: ../erlang/examples/guestfs-erlang.pod:99 msgid "" -"L, L, L, L, L, L, L, " +"L, L, L, L, L, L, L, " "L, L. L." msgstr "" @@ -4812,8 +4830,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 "" @@ -4828,8 +4846,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 @@ -4894,8 +4912,8 @@ msgstr "" #. type: textblock #: ../examples/guestfs-examples.pod:35 msgid "" -"L, L, L, L, L, L, L, " +"L, L, L, L, L, L, L, " "L, L." msgstr "" @@ -4966,15 +4984,15 @@ msgstr "" #: ../examples/guestfs-recipes.pod:32 msgid "" "The links below explain how to use L 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 @@ -5019,15 +5037,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 @@ -5076,8 +5094,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 @@ -5190,8 +5208,8 @@ msgstr "" #: ../examples/guestfs-recipes.pod:128 ../fish/guestfish-actions.pod:9 #: ../fish/guestfish-actions.pod:1450 ../fish/guestfish-actions.pod:1715 #: ../fish/guestfish-actions.pod:2132 ../src/guestfs-actions.pod:18 -#: ../src/guestfs-actions.pod:2326 ../src/guestfs-actions.pod:2750 -#: ../src/guestfs-actions.pod:3309 ../src/guestfs.pod:1685 +#: ../src/guestfs-actions.pod:2334 ../src/guestfs-actions.pod:2758 +#: ../src/guestfs-actions.pod:3317 ../src/guestfs.pod:1685 #: ../tools/virt-win-reg.pl:717 msgid "Notes:" msgstr "" @@ -5241,8 +5259,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 @@ -5325,15 +5343,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 program." +"In the libguestfs source examples directory you will find the latest version " +"of the C program." msgstr "" #. type: =head1 @@ -5407,15 +5425,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 @@ -5538,8 +5556,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." +"machines), change C<-d \"$1\"> to C<-a \"$1\">. See also L." msgstr "" #. type: =head1 @@ -5569,15 +5587,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 @@ -5595,8 +5613,7 @@ 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 @@ -5736,9 +5753,9 @@ msgstr "" #. type: textblock #: ../examples/guestfs-recipes.pod:386 msgid "" -"L, L, L, L, L, L, L, L" -", L, L." +"L, L, L, L, L, L, L, L, L, L." msgstr "" #. type: textblock @@ -5782,16 +5799,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" -" instead." +"to transfer large files into the guest), then you should probably use L instead." msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:28 ../fish/guestfish-actions.pod:214 #: ../fish/guestfish-actions.pod:228 msgid "" -"I In new code, use the L call" -" instead." +"I In new code, use the L call " +"instead." msgstr "" #. type: textblock @@ -5799,20 +5816,20 @@ msgstr "" #: ../fish/guestfish-actions.pod:231 ../fish/guestfish-actions.pod:941 #: ../fish/guestfish-actions.pod:976 ../fish/guestfish-actions.pod:1149 #: ../fish/guestfish-actions.pod:1509 ../fish/guestfish-actions.pod:1523 -#: ../fish/guestfish-actions.pod:3293 ../fish/guestfish-actions.pod:3604 -#: ../fish/guestfish-actions.pod:3652 ../fish/guestfish-actions.pod:4579 -#: ../fish/guestfish-actions.pod:4602 ../fish/guestfish-actions.pod:4624 -#: ../fish/guestfish-actions.pod:4662 ../fish/guestfish-actions.pod:5311 -#: ../fish/guestfish-actions.pod:5417 ../src/guestfs-actions.pod:10 +#: ../fish/guestfish-actions.pod:3284 ../fish/guestfish-actions.pod:3595 +#: ../fish/guestfish-actions.pod:3643 ../fish/guestfish-actions.pod:4561 +#: ../fish/guestfish-actions.pod:4581 ../fish/guestfish-actions.pod:4600 +#: ../fish/guestfish-actions.pod:4638 ../fish/guestfish-actions.pod:5287 +#: ../fish/guestfish-actions.pod:5390 ../src/guestfs-actions.pod:10 #: ../src/guestfs-actions.pod:305 ../src/guestfs-actions.pod:326 -#: ../src/guestfs-actions.pod:1572 ../src/guestfs-actions.pod:1629 -#: ../src/guestfs-actions.pod:1912 ../src/guestfs-actions.pod:2411 -#: ../src/guestfs-actions.pod:2432 ../src/guestfs-actions.pod:5077 -#: ../src/guestfs-actions.pod:5599 ../src/guestfs-actions.pod:5699 -#: ../src/guestfs-actions.pod:6999 ../src/guestfs-actions.pod:7043 -#: ../src/guestfs-actions.pod:7077 ../src/guestfs-actions.pod:7140 -#: ../src/guestfs-actions.pod:8072 ../src/guestfs-actions.pod:8181 -#: ../src/guestfs-actions.pod:8364 +#: ../src/guestfs-actions.pod:1580 ../src/guestfs-actions.pod:1637 +#: ../src/guestfs-actions.pod:1920 ../src/guestfs-actions.pod:2419 +#: ../src/guestfs-actions.pod:2440 ../src/guestfs-actions.pod:5076 +#: ../src/guestfs-actions.pod:5598 ../src/guestfs-actions.pod:5698 +#: ../src/guestfs-actions.pod:6994 ../src/guestfs-actions.pod:7035 +#: ../src/guestfs-actions.pod:7066 ../src/guestfs-actions.pod:7126 +#: ../src/guestfs-actions.pod:8058 ../src/guestfs-actions.pod:8167 +#: ../src/guestfs-actions.pod:8347 msgid "" "Deprecated functions will not be removed from the API, but the fact that " "they are deprecated indicates that there are problems with correct use of " @@ -5840,10 +5857,9 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:41 msgid "" -"This function adds the disk(s) attached to the named libvirt domain C." -" It works by connecting to libvirt, requesting the domain and domain XML " -"from libvirt, parsing it for disks, and calling L on each " -"one." +"This function adds the disk(s) attached to the named libvirt domain C. " +"It works by connecting to libvirt, requesting the domain and domain XML from " +"libvirt, parsing it for disks, and calling L on each one." msgstr "" #. type: textblock @@ -5864,18 +5880,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) 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) 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 parameter sets the libvirt URI (see " -"L). 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 parameter sets the libvirt URI (see L). 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 @@ -5884,8 +5900,8 @@ msgid "" "The optional C flag controls whether this call will try to connect to " "a running virtual machine C process if it sees a suitable " "EchannelE element in the libvirt XML definition. The default (if " -"the flag is omitted) is never to try. See L for more information." +"the flag is omitted) is never to try. See L for more information." msgstr "" #. type: textblock @@ -5893,8 +5909,8 @@ msgstr "" msgid "" "If the C flag is true (default is false) then a UUID I be " "passed instead of the domain name. The C string is treated as a UUID " -"first and looked up, and if that lookup fails then we treat C as a name" -" as usual." +"first and looked up, and if that lookup fails then we treat C as a name " +"as usual." msgstr "" #. type: textblock @@ -5919,8 +5935,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 " -"Ereadonly/E flag is found." +"The whole call is aborted with an error if any disk with the Ereadonly/" +"E flag is found." msgstr "" #. type: textblock @@ -5987,11 +6003,10 @@ msgstr "" #: ../fish/guestfish-actions.pod:856 ../fish/guestfish-actions.pod:894 #: ../fish/guestfish-actions.pod:903 ../fish/guestfish-actions.pod:912 #: ../fish/guestfish-actions.pod:926 ../fish/guestfish-actions.pod:2171 -#: ../fish/guestfish-actions.pod:3342 ../fish/guestfish-actions.pod:3505 -#: ../fish/guestfish-actions.pod:3640 +#: ../fish/guestfish-actions.pod:3333 ../fish/guestfish-actions.pod:3496 +#: ../fish/guestfish-actions.pod:3631 msgid "" -"This command has one or more optional arguments. See L." +"This command has one or more optional arguments. See L." msgstr "" #. type: =head2 @@ -6021,8 +6036,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" -", and specifying the format." +"you should think about replacing calls to this function with calls to L, and specifying the format." msgstr "" #. type: =head2 @@ -6055,9 +6070,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 @@ -6066,8 +6081,8 @@ msgid "This call checks that C exists." msgstr "" #. type: textblock -#: ../fish/guestfish-actions.pod:161 ../fish/guestfish-actions.pod:3304 -#: ../src/guestfs-actions.pod:221 ../src/guestfs-actions.pod:5114 +#: ../fish/guestfish-actions.pod:161 ../fish/guestfish-actions.pod:3295 +#: ../src/guestfs-actions.pod:221 ../src/guestfs-actions.pod:5113 msgid "The optional arguments are:" msgstr "" @@ -6092,9 +6107,9 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:173 msgid "" -"This forces the image format. If you omit this (or use L or L" -") then the format is automatically detected. Possible " -"formats include C and C." +"This forces the image format. If you omit this (or use L or L) then the format is automatically detected. Possible formats " +"include C and C." msgstr "" #. type: textblock @@ -6113,8 +6128,8 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:184 msgid "" -"This rarely-used option lets you emulate the behaviour of the deprecated L" -" call (q.v.)" +"This rarely-used option lets you emulate the behaviour of the deprecated L call (q.v.)" msgstr "" #. type: =item @@ -6125,8 +6140,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 @@ -6231,8 +6246,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 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 again before you can use any " "other Augeas functions." msgstr "" @@ -6391,10 +6406,9 @@ 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 environment variable or call L." +"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 environment variable or call L." msgstr "" #. type: =item @@ -6453,8 +6467,8 @@ msgstr "" #. type: textblock #: ../fish/guestfish-actions.pod:344 ../src/guestfs-actions.pod:492 msgid "" -"Create a new sibling C