X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=po%2Flibguestfs.pot;h=1ce94ba4b9681a78f2b3841ed987e101c542c423;hp=8889958c9f14d7b5acf5b481f66c1a52af936566;hb=e1e78bcef5e4654bd2456bd696840329359d35cd;hpb=204d54609b4b3e4ca637f0ce2fe98c33ce9d008b

diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 8889958..1ce94ba 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.5.23\n"
+"Project-Id-Version: libguestfs 1.11.11\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2010-10-22 23:11+0100\n"
+"POT-Creation-Date: 2011-06-21 13:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,292 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: cat/virt-cat.c:57 cat/virt-filesystems.c:99 cat/virt-ls.c:99 df/main.c:70
+#: edit/virt-edit.c:73 fish/fish.c:96 fuse/guestmount.c:908
+#: inspector/virt-inspector.c:72 rescue/virt-rescue.c:59
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: cat/virt-cat.c:61
+#, c-format
+msgid ""
+"%s: display files in a virtual machine\n"
+"Copyright (C) 2010 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname file [file ...]\n"
+"  %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: cat/virt-cat.c:117 cat/virt-filesystems.c:202 cat/virt-ls.c:192
+#: df/domains.c:428 df/main.c:136 edit/virt-edit.c:141 fish/fish.c:219
+#: fuse/guestmount.c:1024 inspector/virt-inspector.c:132
+#: rescue/virt-rescue.c:133
+#, c-format
+msgid "guestfs_create: failed to create handle\n"
+msgstr ""
+
+#: cat/virt-cat.c:139 cat/virt-filesystems.c:256 cat/virt-ls.c:242
+#: df/main.c:160 edit/virt-edit.c:163 fish/fish.c:276 fuse/guestmount.c:1061
+#: inspector/virt-inspector.c:154 rescue/virt-rescue.c:157
+#, c-format
+msgid "%s: unknown long option: %s (%d)\n"
+msgstr ""
+
+#: cat/virt-filesystems.c:103
+#, c-format
+msgid ""
+"%s: list filesystems, partitions, block devices, LVM in a VM\n"
+"Copyright (C) 2010 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname\n"
+"  %s [--options] -a disk.img [-a disk.img ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  --all                Display everything\n"
+"  --blkdevs|--block-devices\n"
+"                       Display block devices\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  --csv                Output as Comma-Separated Values\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
+"  --extra              Display swap and data filesystems\n"
+"  --filesystems        Display mountable filesystems\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  -h|--human-readable  Human-readable sizes in --long output\n"
+"  --help               Display brief help\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  -l|--long            Long output\n"
+"  --lvs|--logvols|--logical-volumes\n"
+"                       Display LVM logical volumes\n"
+"  --no-title           No title in --long output\n"
+"  --parts|--partitions Display partitions\n"
+"  --pvs|--physvols|--physical-volumes\n"
+"                       Display LVM physical volumes\n"
+"  --uuid|--uuids       Add UUIDs to --long output\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  --vgs|--volgroups|--volume-groups\n"
+"                       Display LVM volume groups\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: cat/virt-filesystems.c:318 cat/virt-ls.c:347 df/main.c:255
+#, c-format
+msgid "%s: you cannot use -h and --csv options together.\n"
+msgstr ""
+
+#: cat/virt-ls.c:103
+#, c-format
+msgid ""
+"%s: list files in a virtual machine\n"
+"Copyright (C) 2010-2011 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname dir [dir ...]\n"
+"  %s [--options] -a disk.img [-a disk.img ...] dir [dir ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  --checksum[=...]     Display file checksums\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  --csv                Comma-Separated Values output\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
+"  --extra-stats        Display extra stats\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  -h|--human-readable  Human-readable sizes in output\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  -l|--long            Long listing\n"
+"  -R|--recursive       Recursive listing\n"
+"  --times              Display file times\n"
+"  --time-days          Display file times as days before now\n"
+"  --time-relative      Display file times as seconds before now\n"
+"  --time-t             Display file times as time_t's\n"
+"  --uids               Display UID, GID\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: cat/virt-ls.c:338
+#, c-format
+msgid ""
+"%s: used a flag which can only be combined with -lR mode\n"
+"For more information, read the virt-ls(1) man page.\n"
+msgstr ""
+
+#: cat/virt-ls.c:577
+#, c-format
+msgid "%s: error getting extended attrs for %s %s\n"
+msgstr ""
+
+#: cat/virt-ls.c:583
+#, c-format
+msgid "%s: error: cannot parse xattr count for %s %s\n"
+msgstr ""
+
+#: df/domains.c:115
+#, c-format
+msgid "%s: could not connect to libvirt (code %d, domain %d): %s"
+msgstr ""
+
+#: df/domains.c:124
+#, c-format
+msgid "%s: could not get number of running domains (code %d, domain %d): %s"
+msgstr ""
+
+#: df/domains.c:134
+#, c-format
+msgid "%s: could not list running domains (code %d, domain %d): %s"
+msgstr ""
+
+#: df/domains.c:145
+#, c-format
+msgid "%s: could not get number of inactive domains (code %d, domain %d): %s"
+msgstr ""
+
+#: df/domains.c:155
+#, c-format
+msgid "%s: could not list inactive domains (code %d, domain %d): %s"
+msgstr ""
+
+#: df/domains.c:281
+#, c-format
+msgid "%s: ignoring %s, it has too many disks (%zu > %d)"
+msgstr ""
+
+#: df/main.c:74
+#, c-format
+msgid ""
+"%s: display free space on virtual filesystems\n"
+"Copyright (C) 2010 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname\n"
+"  %s [--options] -a disk.img [-a disk.img ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  --csv                Output as Comma-Separated Values\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  -h|--human-readable  Human-readable sizes in --long output\n"
+"  --help               Display brief help\n"
+"  -i|--inodes          Display inodes\n"
+"  --one-per-guest      Separate appliance per guest\n"
+"  --uuid               Add UUIDs to --long output\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: df/main.c:267
+#, c-format
+msgid "%s: compiled without support for libvirt.\n"
+msgstr ""
+
+#: df/output.c:50
+msgid "VirtualMachine"
+msgstr ""
+
+#: df/output.c:51
+msgid "Filesystem"
+msgstr ""
+
+#: df/output.c:54
+msgid "1K-blocks"
+msgstr ""
+
+#: df/output.c:56
+msgid "Size"
+msgstr ""
+
+#: df/output.c:57
+msgid "Used"
+msgstr ""
+
+#: df/output.c:58
+msgid "Available"
+msgstr ""
+
+#: df/output.c:59
+msgid "Use%"
+msgstr ""
+
+#: df/output.c:61
+msgid "Inodes"
+msgstr ""
+
+#: df/output.c:62
+msgid "IUsed"
+msgstr ""
+
+#: df/output.c:63
+msgid "IFree"
+msgstr ""
+
+#: df/output.c:64
+msgid "IUse%"
+msgstr ""
+
+#: edit/virt-edit.c:77
+#, c-format
+msgid ""
+"%s: Edit a file in a virtual machine\n"
+"Copyright (C) 2009-2011 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname file [file ...]\n"
+"  %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  -b|--backup .ext     Backup original as original.ext\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
+"  -e|--expr expr       Non-interactive editing using Perl expr\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: edit/virt-edit.c:175
+#, c-format
+msgid "%s: -b option given multiple times\n"
+msgstr ""
+
+#: edit/virt-edit.c:192
+#, c-format
+msgid "%s: -e option given multiple times\n"
+msgstr ""
+
+#: edit/virt-edit.c:585 fish/fish.c:1444
+#, c-format
+msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
+msgstr ""
+
+#: edit/virt-edit.c:599
+#, c-format
+msgid "%s: drive '%c:' not found.\n"
+msgstr ""
+
 #: fish/alloc.c:37
 #, c-format
 msgid "use 'alloc file size' to create an image\n"
@@ -38,1556 +324,1655 @@ msgstr ""
 msgid "%s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2574
 msgid "Command"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2574
 msgid "Description"
 msgstr ""
 
-#: fish/cmds.c:43 fish/cmds.c:473
+#: fish/cmds.c:2576
 msgid "add a CD-ROM disk image to examine"
 msgstr ""
 
-#: fish/cmds.c:44 fish/cmds.c:45 fish/cmds.c:468 fish/cmds.c:698
+#: fish/cmds.c:2577
+msgid "add the disk(s) from a named libvirt domain"
+msgstr ""
+
+#: fish/cmds.c:2578 fish/cmds.c:2579
 msgid "add an image to examine or modify"
 msgstr ""
 
-#: fish/cmds.c:46 fish/cmds.c:478
+#: fish/cmds.c:2580
 msgid "add a drive in snapshot mode (read-only)"
 msgstr ""
 
-#: fish/cmds.c:47 fish/cmds.c:628
+#: fish/cmds.c:2581
 msgid "add a drive read-only specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:48 fish/cmds.c:623
+#: fish/cmds.c:2582
 msgid "add a drive specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:49 fish/cmds.c:388
+#: fish/cmds.c:2583
 msgid "allocate and add a disk file"
 msgstr ""
 
-#: fish/cmds.c:50 fish/cmds.c:1893
+#: fish/cmds.c:2584
 msgid "clear Augeas path"
 msgstr ""
 
-#: fish/cmds.c:51 fish/cmds.c:783
+#: fish/cmds.c:2585
 msgid "close the current Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:52 fish/cmds.c:793
+#: fish/cmds.c:2586
 msgid "define an Augeas node"
 msgstr ""
 
-#: fish/cmds.c:53 fish/cmds.c:788
+#: fish/cmds.c:2587
 msgid "define an Augeas variable"
 msgstr ""
 
-#: fish/cmds.c:54 fish/cmds.c:798
+#: fish/cmds.c:2588
 msgid "look up the value of an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:55 fish/cmds.c:778
+#: fish/cmds.c:2589
 msgid "create a new Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:56 fish/cmds.c:808
+#: fish/cmds.c:2590
 msgid "insert a sibling Augeas node"
 msgstr ""
 
-#: fish/cmds.c:57 fish/cmds.c:833
+#: fish/cmds.c:2591
 msgid "load files into the tree"
 msgstr ""
 
-#: fish/cmds.c:58 fish/cmds.c:838
+#: fish/cmds.c:2592
 msgid "list Augeas nodes under augpath"
 msgstr ""
 
-#: fish/cmds.c:59 fish/cmds.c:823
+#: fish/cmds.c:2593
 msgid "return Augeas nodes which match augpath"
 msgstr ""
 
-#: fish/cmds.c:60 fish/cmds.c:818
+#: fish/cmds.c:2594
 msgid "move Augeas node"
 msgstr ""
 
-#: fish/cmds.c:61 fish/cmds.c:813
+#: fish/cmds.c:2595
 msgid "remove an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:62 fish/cmds.c:828
+#: fish/cmds.c:2596
 msgid "write all pending Augeas changes to disk"
 msgstr ""
 
-#: fish/cmds.c:63 fish/cmds.c:803
+#: fish/cmds.c:2597
 msgid "set Augeas path to value"
 msgstr ""
 
-#: fish/cmds.c:64 fish/cmds.c:1778
+#: fish/cmds.c:2598
 msgid "test availability of some parts of the API"
 msgstr ""
 
-#: fish/cmds.c:65 fish/cmds.c:1953
+#: fish/cmds.c:2599
 msgid "return a list of all optional groups"
 msgstr ""
 
-#: fish/cmds.c:66 fish/cmds.c:1908
+#: fish/cmds.c:2600
 msgid "upload base64-encoded data to file"
 msgstr ""
 
-#: fish/cmds.c:67 fish/cmds.c:1913
+#: fish/cmds.c:2601
 msgid "download file and encode as base64"
 msgstr ""
 
-#: fish/cmds.c:68 fish/cmds.c:1018
+#: fish/cmds.c:2602
 msgid "flush device buffers"
 msgstr ""
 
-#: fish/cmds.c:69 fish/cmds.c:998
+#: fish/cmds.c:2603
 msgid "get blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:70 fish/cmds.c:988
+#: fish/cmds.c:2604
 msgid "is block device set to read-only"
 msgstr ""
 
-#: fish/cmds.c:71 fish/cmds.c:1013
+#: fish/cmds.c:2605
 msgid "get total size of device in bytes"
 msgstr ""
 
-#: fish/cmds.c:72 fish/cmds.c:993
+#: fish/cmds.c:2606
 msgid "get sectorsize of block device"
 msgstr ""
 
-#: fish/cmds.c:73 fish/cmds.c:1008
+#: fish/cmds.c:2607
 msgid "get total size of device in 512-byte sectors"
 msgstr ""
 
-#: fish/cmds.c:74 fish/cmds.c:1023
+#: fish/cmds.c:2608
 msgid "reread partition table"
 msgstr ""
 
-#: fish/cmds.c:75 fish/cmds.c:1003
+#: fish/cmds.c:2609
 msgid "set blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:76 fish/cmds.c:978
+#: fish/cmds.c:2610
 msgid "set block device to read-only"
 msgstr ""
 
-#: fish/cmds.c:77 fish/cmds.c:983
+#: fish/cmds.c:2611
 msgid "set block device to read-write"
 msgstr ""
 
-#: fish/cmds.c:78 fish/cmds.c:1683
+#: fish/cmds.c:2612
 msgid "return true path on case-insensitive filesystem"
 msgstr ""
 
-#: fish/cmds.c:79 fish/cmds.c:718
+#: fish/cmds.c:2613
 msgid "list the contents of a file"
 msgstr ""
 
-#: fish/cmds.c:80 fish/cmds.c:1038
+#: fish/cmds.c:2614
 msgid "compute MD5, SHAx or CRC checksum of file"
 msgstr ""
 
-#: fish/cmds.c:81 fish/cmds.c:1883
+#: fish/cmds.c:2615
 msgid "compute MD5, SHAx or CRC checksum of the contents of a device"
 msgstr ""
 
-#: fish/cmds.c:82 fish/cmds.c:1918
+#: fish/cmds.c:2616
 msgid "compute MD5, SHAx or CRC checksum of files in a directory"
 msgstr ""
 
-#: fish/cmds.c:83 fish/cmds.c:868
+#: fish/cmds.c:2617
 msgid "change file mode"
 msgstr ""
 
-#: fish/cmds.c:84 fish/cmds.c:184 fish/cmds.c:873 fish/cmds.c:1713
+#: fish/cmds.c:2618 fish/cmds.c:2736
 msgid "change file owner and group"
 msgstr ""
 
-#: fish/cmds.c:85 fish/cmds.c:948
+#: fish/cmds.c:2619
 msgid "run a command from the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:86 fish/cmds.c:953
+#: fish/cmds.c:2620
 msgid "run a command, returning lines"
 msgstr ""
 
-#: fish/cmds.c:87 fish/cmds.c:483
+#: fish/cmds.c:2621
 msgid "add qemu parameters"
 msgstr ""
 
-#: fish/cmds.c:88 fish/cmds.c:393
+#: fish/cmds.c:2622
 msgid "copy local files or directories into an image"
 msgstr ""
 
-#: fish/cmds.c:89 fish/cmds.c:398
+#: fish/cmds.c:2623
 msgid "copy remote files or directories out of an image"
 msgstr ""
 
-#: fish/cmds.c:90 fish/cmds.c:1833
+#: fish/cmds.c:2624
 msgid "copy size bytes from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:91 fish/cmds.c:1133
+#: fish/cmds.c:2625
 msgid "copy a file"
 msgstr ""
 
-#: fish/cmds.c:92 fish/cmds.c:1138
+#: fish/cmds.c:2626
 msgid "copy a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:93 fish/cmds.c:1783
+#: fish/cmds.c:2627
 msgid "copy from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:94 fish/cmds.c:1078
+#: fish/cmds.c:2628
 msgid "debugging and internals"
 msgstr ""
 
-#: fish/cmds.c:95 fish/cmds.c:1903
+#: fish/cmds.c:2629
+msgid "debug the QEMU command line (internal use only)"
+msgstr ""
+
+#: fish/cmds.c:2630
 msgid "upload a file to the appliance (internal use only)"
 msgstr ""
 
-#: fish/cmds.c:96 fish/cmds.c:1323
+#: fish/cmds.c:2631
 msgid "report file system disk space usage"
 msgstr ""
 
-#: fish/cmds.c:97 fish/cmds.c:1328
+#: fish/cmds.c:2632
 msgid "report file system disk space usage (human readable)"
 msgstr ""
 
-#: fish/cmds.c:98 fish/cmds.c:1153
+#: fish/cmds.c:2633
 msgid "return kernel messages"
 msgstr ""
 
-#: fish/cmds.c:99 fish/cmds.c:1033
+#: fish/cmds.c:2634
 msgid "download a file to the local machine"
 msgstr ""
 
-#: fish/cmds.c:100 fish/cmds.c:2068
+#: fish/cmds.c:2635
 msgid "download a file to the local machine with offset and size"
 msgstr ""
 
-#: fish/cmds.c:101 fish/cmds.c:1148
+#: fish/cmds.c:2636
 msgid "drop kernel page cache, dentries and inodes"
 msgstr ""
 
-#: fish/cmds.c:102 fish/cmds.c:1333
+#: fish/cmds.c:2637
 msgid "estimate file space usage"
 msgstr ""
 
-#: fish/cmds.c:103 fish/cmds.c:1238
+#: fish/cmds.c:2638
 msgid "check an ext2/ext3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:104 fish/cmds.c:403
+#: fish/cmds.c:2639
 msgid "display a line of text"
 msgstr ""
 
-#: fish/cmds.c:105 fish/cmds.c:1673
+#: fish/cmds.c:2640
 msgid "echo arguments back to the client"
 msgstr ""
 
-#: fish/cmds.c:106 fish/cmds.c:408
+#: fish/cmds.c:2641
 msgid "edit a file"
 msgstr ""
 
-#: fish/cmds.c:107 fish/cmds.c:108 fish/cmds.c:113 fish/cmds.c:114
-#: fish/cmds.c:145 fish/cmds.c:146 fish/cmds.c:372 fish/cmds.c:373
-#: fish/cmds.c:377 fish/cmds.c:378 fish/cmds.c:380 fish/cmds.c:381
-#: fish/cmds.c:1453 fish/cmds.c:1458 fish/cmds.c:1463 fish/cmds.c:1468
-#: fish/cmds.c:1473 fish/cmds.c:1478 fish/cmds.c:1483 fish/cmds.c:1488
-#: fish/cmds.c:1493 fish/cmds.c:1498 fish/cmds.c:1503 fish/cmds.c:1508
+#: fish/cmds.c:2642 fish/cmds.c:2643 fish/cmds.c:2648 fish/cmds.c:2649
+#: fish/cmds.c:2682 fish/cmds.c:2683 fish/cmds.c:2929 fish/cmds.c:2930
+#: fish/cmds.c:2934 fish/cmds.c:2935 fish/cmds.c:2937 fish/cmds.c:2938
 msgid "return lines matching a pattern"
 msgstr ""
 
-#: fish/cmds.c:109 fish/cmds.c:1163
+#: fish/cmds.c:2644
 msgid "test if two files have equal contents"
 msgstr ""
 
-#: fish/cmds.c:110 fish/cmds.c:878
+#: fish/cmds.c:2645
 msgid "test if file or directory exists"
 msgstr ""
 
-#: fish/cmds.c:111 fish/cmds.c:112 fish/cmds.c:1543 fish/cmds.c:1958
+#: fish/cmds.c:2646 fish/cmds.c:2647
 msgid "preallocate a file in the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:115 fish/cmds.c:943
+#: fish/cmds.c:2650
 msgid "determine file type"
 msgstr ""
 
-#: fish/cmds.c:116 fish/cmds.c:633
+#: fish/cmds.c:2651
 msgid "detect the architecture of a binary file"
 msgstr ""
 
-#: fish/cmds.c:117 fish/cmds.c:1788
+#: fish/cmds.c:2652
 msgid "return the size of the file in bytes"
 msgstr ""
 
-#: fish/cmds.c:118 fish/cmds.c:1773
+#: fish/cmds.c:2653
 msgid "fill a file with octets"
 msgstr ""
 
-#: fish/cmds.c:119 fish/cmds.c:1923
+#: fish/cmds.c:2654
 msgid "fill a file with a repeating pattern of bytes"
 msgstr ""
 
-#: fish/cmds.c:120 fish/cmds.c:1233
+#: fish/cmds.c:2655
 msgid "find all files and directories"
 msgstr ""
 
-#: fish/cmds.c:121 fish/cmds.c:1678
+#: fish/cmds.c:2656
 msgid "find all files and directories, returning NUL-separated list"
 msgstr ""
 
-#: fish/cmds.c:122 fish/cmds.c:2028
+#: fish/cmds.c:2657
 msgid "find a filesystem by label"
 msgstr ""
 
-#: fish/cmds.c:123 fish/cmds.c:2023
+#: fish/cmds.c:2658
 msgid "find a filesystem by UUID"
 msgstr ""
 
-#: fish/cmds.c:124 fish/cmds.c:1118
+#: fish/cmds.c:2659
 msgid "run the filesystem checker"
 msgstr ""
 
-#: fish/cmds.c:125 fish/cmds.c:513
+#: fish/cmds.c:2660
 msgid "get the additional kernel options"
 msgstr ""
 
-#: fish/cmds.c:126 fish/cmds.c:523
+#: fish/cmds.c:2661
+msgid "get the attach method"
+msgstr ""
+
+#: fish/cmds.c:2662
 msgid "get autosync mode"
 msgstr ""
 
-#: fish/cmds.c:127 fish/cmds.c:608
+#: fish/cmds.c:2663
 msgid "get direct appliance mode flag"
 msgstr ""
 
-#: fish/cmds.c:128 fish/cmds.c:1103
+#: fish/cmds.c:2664
 msgid "get the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:129 fish/cmds.c:1113
+#: fish/cmds.c:2665
 msgid "get the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:130 fish/cmds.c:568
+#: fish/cmds.c:2666
 msgid "get memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:131 fish/cmds.c:688
+#: fish/cmds.c:2667
 msgid "get enable network flag"
 msgstr ""
 
-#: fish/cmds.c:132 fish/cmds.c:503
+#: fish/cmds.c:2668
 msgid "get the search path"
 msgstr ""
 
-#: fish/cmds.c:133 fish/cmds.c:573
+#: fish/cmds.c:2669
 msgid "get PID of qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:134 fish/cmds.c:493
+#: fish/cmds.c:2670
 msgid "get the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:135 fish/cmds.c:618
+#: fish/cmds.c:2671
 msgid "get recovery process enabled flag"
 msgstr ""
 
-#: fish/cmds.c:136 fish/cmds.c:588
+#: fish/cmds.c:2672
 msgid "get SELinux enabled flag"
 msgstr ""
 
-#: fish/cmds.c:137 fish/cmds.c:558
+#: fish/cmds.c:2673
 msgid "get the current state"
 msgstr ""
 
-#: fish/cmds.c:138 fish/cmds.c:598
+#: fish/cmds.c:2674
 msgid "get command trace enabled flag"
 msgstr ""
 
-#: fish/cmds.c:139 fish/cmds.c:1898
+#: fish/cmds.c:2675
 msgid "get the current umask"
 msgstr ""
 
-#: fish/cmds.c:140 fish/cmds.c:533
+#: fish/cmds.c:2676
 msgid "get verbose mode"
 msgstr ""
 
-#: fish/cmds.c:141 fish/cmds.c:1628
+#: fish/cmds.c:2677
 msgid "get SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:142 fish/cmds.c:185 fish/cmds.c:1403 fish/cmds.c:1408
+#: fish/cmds.c:2678 fish/cmds.c:2737
+msgid "get a single extended attribute"
+msgstr ""
+
+#: fish/cmds.c:2679 fish/cmds.c:2738
 msgid "list extended attributes of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:143 fish/cmds.c:413
+#: fish/cmds.c:2680
 msgid "expand wildcards in command"
 msgstr ""
 
-#: fish/cmds.c:144 fish/cmds.c:1263
+#: fish/cmds.c:2681
 msgid "expand a wildcard path"
 msgstr ""
 
-#: fish/cmds.c:147 fish/cmds.c:1128
+#: fish/cmds.c:2684
 msgid "install GRUB"
 msgstr ""
 
-#: fish/cmds.c:148 fish/cmds.c:1303
+#: fish/cmds.c:2685
 msgid "return first 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:149 fish/cmds.c:1308
+#: fish/cmds.c:2686
 msgid "return first N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:150 fish/cmds.c:1178
+#: fish/cmds.c:2687
 msgid "dump a file in hexadecimal"
 msgstr ""
 
-#: fish/cmds.c:151 fish/cmds.c:418
+#: fish/cmds.c:2688
 msgid "edit with a hex editor"
 msgstr ""
 
-#: fish/cmds.c:152 fish/cmds.c:1803
+#: fish/cmds.c:2689
 msgid "list the contents of a single file in an initrd"
 msgstr ""
 
-#: fish/cmds.c:153 fish/cmds.c:1338
+#: fish/cmds.c:2690
 msgid "list files in an initrd"
 msgstr ""
 
-#: fish/cmds.c:154 fish/cmds.c:1598
+#: fish/cmds.c:2691
 msgid "add an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:155 fish/cmds.c:1618
+#: fish/cmds.c:2692
 msgid "close the inotify handle"
 msgstr ""
 
-#: fish/cmds.c:156 fish/cmds.c:1613
+#: fish/cmds.c:2693
 msgid "return list of watched files that had events"
 msgstr ""
 
-#: fish/cmds.c:157 fish/cmds.c:1593
+#: fish/cmds.c:2694
 msgid "create an inotify handle"
 msgstr ""
 
-#: fish/cmds.c:158 fish/cmds.c:1608
+#: fish/cmds.c:2695
 msgid "return list of inotify events"
 msgstr ""
 
-#: fish/cmds.c:159 fish/cmds.c:1603
+#: fish/cmds.c:2696
 msgid "remove an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:160 fish/cmds.c:648
+#: fish/cmds.c:2697
 msgid "get architecture of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:161 fish/cmds.c:653
+#: fish/cmds.c:2698
 msgid "get distro of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:162 fish/cmds.c:678
+#: fish/cmds.c:2699
+msgid "get drive letter mappings"
+msgstr ""
+
+#: fish/cmds.c:2700
 msgid "get filesystems associated with inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:163 fish/cmds.c:658
+#: fish/cmds.c:2701
+msgid "get format of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2702
+msgid "get hostname of the operating system"
+msgstr ""
+
+#: fish/cmds.c:2703
 msgid "get major version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:164 fish/cmds.c:663
+#: fish/cmds.c:2704
 msgid "get minor version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:165 fish/cmds.c:673
+#: fish/cmds.c:2705
 msgid "get mountpoints of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:166 fish/cmds.c:668
+#: fish/cmds.c:2706
+msgid "get package format used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2707
+msgid "get package management tool used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2708
 msgid "get product name of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:167 fish/cmds.c:643
+#: fish/cmds.c:2709
+msgid "get product variant of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2710
+msgid "return list of operating systems found by last inspection"
+msgstr ""
+
+#: fish/cmds.c:2711
 msgid "get type of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:168 fish/cmds.c:638
+#: fish/cmds.c:2712
+msgid "get Windows CurrentControlSet of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2713
+msgid "get Windows systemroot of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2714
+msgid "get live flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2715
+msgid "get multipart flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2716
+msgid "get netinst (network installer) flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2717
+msgid "get list of applications installed in the operating system"
+msgstr ""
+
+#: fish/cmds.c:2718
 msgid "inspect disk and return list of operating systems found"
 msgstr ""
 
-#: fish/cmds.c:169 fish/cmds.c:2038
+#: fish/cmds.c:2719
 msgid "test if block device"
 msgstr ""
 
-#: fish/cmds.c:170 fish/cmds.c:553
+#: fish/cmds.c:2720
 msgid "is busy processing a command"
 msgstr ""
 
-#: fish/cmds.c:171 fish/cmds.c:2033
+#: fish/cmds.c:2721
 msgid "test if character device"
 msgstr ""
 
-#: fish/cmds.c:172 fish/cmds.c:543
+#: fish/cmds.c:2722
 msgid "is in configuration state"
 msgstr ""
 
-#: fish/cmds.c:173 fish/cmds.c:888
+#: fish/cmds.c:2723
 msgid "test if a directory"
 msgstr ""
 
-#: fish/cmds.c:174 fish/cmds.c:2043
+#: fish/cmds.c:2724
 msgid "test if FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:175 fish/cmds.c:883
+#: fish/cmds.c:2725
 msgid "test if a regular file"
 msgstr ""
 
-#: fish/cmds.c:176 fish/cmds.c:548
+#: fish/cmds.c:2726
 msgid "is launching subprocess"
 msgstr ""
 
-#: fish/cmds.c:177 fish/cmds.c:2018
+#: fish/cmds.c:2727
 msgid "test if device is a logical volume"
 msgstr ""
 
-#: fish/cmds.c:178 fish/cmds.c:538
+#: fish/cmds.c:2728
 msgid "is ready to accept commands"
 msgstr ""
 
-#: fish/cmds.c:179 fish/cmds.c:2053
+#: fish/cmds.c:2729
 msgid "test if socket"
 msgstr ""
 
-#: fish/cmds.c:180 fish/cmds.c:2048
+#: fish/cmds.c:2730
 msgid "test if symbolic link"
 msgstr ""
 
-#: fish/cmds.c:181 fish/cmds.c:463
+#: fish/cmds.c:2731
+msgid "test if a file contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2732
+msgid "test if a device contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2733
 msgid "kill the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:182 fish/cmds.c:458
+#: fish/cmds.c:2734
 msgid "launch the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:183 fish/cmds.c:423
+#: fish/cmds.c:2735
 msgid "change working directory"
 msgstr ""
 
-#: fish/cmds.c:186 fish/cmds.c:733
+#: fish/cmds.c:2739
 msgid "list the block devices"
 msgstr ""
 
-#: fish/cmds.c:187 fish/cmds.c:693
+#: fish/cmds.c:2740
 msgid "list filesystems"
 msgstr ""
 
-#: fish/cmds.c:188 fish/cmds.c:738
+#: fish/cmds.c:2741
 msgid "list the partitions"
 msgstr ""
 
-#: fish/cmds.c:189 fish/cmds.c:723
+#: fish/cmds.c:2742
 msgid "list the files in a directory (long format)"
 msgstr ""
 
-#: fish/cmds.c:190 fish/cmds.c:191 fish/cmds.c:1518 fish/cmds.c:1523
+#: fish/cmds.c:2743 fish/cmds.c:2744
 msgid "create a hard link"
 msgstr ""
 
-#: fish/cmds.c:192 fish/cmds.c:193 fish/cmds.c:1528 fish/cmds.c:1533
+#: fish/cmds.c:2745 fish/cmds.c:2746
 msgid "create a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:194 fish/cmds.c:283 fish/cmds.c:1423 fish/cmds.c:1428
+#: fish/cmds.c:2747 fish/cmds.c:2838
 msgid "remove extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:195 fish/cmds.c:728
+#: fish/cmds.c:2748
 msgid "list the files in a directory"
 msgstr ""
 
-#: fish/cmds.c:196 fish/cmds.c:308 fish/cmds.c:1413 fish/cmds.c:1418
+#: fish/cmds.c:2749 fish/cmds.c:2865
 msgid "set extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:197 fish/cmds.c:963
+#: fish/cmds.c:2750
 msgid "get file information for a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:198 fish/cmds.c:1718
+#: fish/cmds.c:2751
 msgid "lstat on multiple files"
 msgstr ""
 
-#: fish/cmds.c:199 fish/cmds.c:2008
+#: fish/cmds.c:2752
 msgid "add a key on a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:200 fish/cmds.c:1993
+#: fish/cmds.c:2753
 msgid "close a LUKS device"
 msgstr ""
 
-#: fish/cmds.c:201 fish/cmds.c:202 fish/cmds.c:1998 fish/cmds.c:2003
+#: fish/cmds.c:2754 fish/cmds.c:2755
 msgid "format a block device as a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:203 fish/cmds.c:2013
+#: fish/cmds.c:2756
 msgid "remove a key from a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:204 fish/cmds.c:1983
+#: fish/cmds.c:2757
 msgid "open a LUKS-encrypted block device"
 msgstr ""
 
-#: fish/cmds.c:205 fish/cmds.c:1988
+#: fish/cmds.c:2758
 msgid "open a LUKS-encrypted block device read-only"
 msgstr ""
 
-#: fish/cmds.c:206 fish/cmds.c:903
+#: fish/cmds.c:2759
 msgid "create an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:207 fish/cmds.c:1978
+#: fish/cmds.c:2760
+msgid "get canonical name of an LV"
+msgstr ""
+
+#: fish/cmds.c:2761
 msgid "clear LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:208 fish/cmds.c:938
+#: fish/cmds.c:2762
 msgid "remove all LVM LVs, VGs and PVs"
 msgstr ""
 
-#: fish/cmds.c:209 fish/cmds.c:1973
+#: fish/cmds.c:2763
 msgid "set LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:210 fish/cmds.c:1083
+#: fish/cmds.c:2764
 msgid "remove an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:211 fish/cmds.c:1793
+#: fish/cmds.c:2765
 msgid "rename an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:212 fish/cmds.c:1223
+#: fish/cmds.c:2766
 msgid "resize an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:213 fish/cmds.c:1888
+#: fish/cmds.c:2767
 msgid "expand an LV to fill free space"
 msgstr ""
 
-#: fish/cmds.c:214 fish/cmds.c:215 fish/cmds.c:753 fish/cmds.c:768
+#: fish/cmds.c:2768 fish/cmds.c:2769
 msgid "list the LVM logical volumes (LVs)"
 msgstr ""
 
-#: fish/cmds.c:216 fish/cmds.c:1818
+#: fish/cmds.c:2770
 msgid "get the UUID of a logical volume"
 msgstr ""
 
-#: fish/cmds.c:217 fish/cmds.c:1723
+#: fish/cmds.c:2771
 msgid "lgetxattr on multiple files"
 msgstr ""
 
-#: fish/cmds.c:218 fish/cmds.c:428
+#: fish/cmds.c:2772
 msgid "open the manual"
 msgstr ""
 
-#: fish/cmds.c:219 fish/cmds.c:858
+#: fish/cmds.c:2773
 msgid "create a directory"
 msgstr ""
 
-#: fish/cmds.c:220 fish/cmds.c:1708
+#: fish/cmds.c:2774
 msgid "create a directory with a particular mode"
 msgstr ""
 
-#: fish/cmds.c:221 fish/cmds.c:863
+#: fish/cmds.c:2775
 msgid "create a directory and parents"
 msgstr ""
 
-#: fish/cmds.c:222 fish/cmds.c:1283
+#: fish/cmds.c:2776
 msgid "create a temporary directory"
 msgstr ""
 
-#: fish/cmds.c:223 fish/cmds.c:224 fish/cmds.c:225 fish/cmds.c:1653
-#: fish/cmds.c:1658 fish/cmds.c:1663
+#: fish/cmds.c:2777 fish/cmds.c:2778 fish/cmds.c:2779
 msgid "make ext2/3/4 filesystem with external journal"
 msgstr ""
 
-#: fish/cmds.c:226 fish/cmds.c:1638
+#: fish/cmds.c:2780
 msgid "make ext2/3/4 external journal"
 msgstr ""
 
-#: fish/cmds.c:227 fish/cmds.c:1643
+#: fish/cmds.c:2781
 msgid "make ext2/3/4 external journal with label"
 msgstr ""
 
-#: fish/cmds.c:228 fish/cmds.c:1648
+#: fish/cmds.c:2782
 msgid "make ext2/3/4 external journal with UUID"
 msgstr ""
 
-#: fish/cmds.c:229 fish/cmds.c:1368
+#: fish/cmds.c:2783
 msgid "make FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:230 fish/cmds.c:908
+#: fish/cmds.c:2784 fish/cmds.c:2786
 msgid "make a filesystem"
 msgstr ""
 
-#: fish/cmds.c:231 fish/cmds.c:1633
+#: fish/cmds.c:2785
 msgid "make a filesystem with block size"
 msgstr ""
 
-#: fish/cmds.c:232 fish/cmds.c:1438
+#: fish/cmds.c:2787
 msgid "create a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:233 fish/cmds.c:1363
+#: fish/cmds.c:2788
 msgid "make block, character or FIFO devices"
 msgstr ""
 
-#: fish/cmds.c:234 fish/cmds.c:1373
+#: fish/cmds.c:2789
 msgid "make block device node"
 msgstr ""
 
-#: fish/cmds.c:235 fish/cmds.c:1378
+#: fish/cmds.c:2790
 msgid "make char device node"
 msgstr ""
 
-#: fish/cmds.c:236 fish/cmds.c:1348
+#: fish/cmds.c:2791
 msgid "create a swap partition"
 msgstr ""
 
-#: fish/cmds.c:237 fish/cmds.c:1353
+#: fish/cmds.c:2792
 msgid "create a swap partition with a label"
 msgstr ""
 
-#: fish/cmds.c:238 fish/cmds.c:1358
+#: fish/cmds.c:2793
 msgid "create a swap partition with an explicit UUID"
 msgstr ""
 
-#: fish/cmds.c:239 fish/cmds.c:1588
+#: fish/cmds.c:2794
 msgid "create a swap file"
 msgstr ""
 
-#: fish/cmds.c:240 fish/cmds.c:1668
+#: fish/cmds.c:2795
 msgid "load a kernel module"
 msgstr ""
 
-#: fish/cmds.c:241 fish/cmds.c:433
+#: fish/cmds.c:2796
 msgid "view a file"
 msgstr ""
 
-#: fish/cmds.c:242 fish/cmds.c:703
+#: fish/cmds.c:2797
 msgid "mount a guest disk at a position in the filesystem"
 msgstr ""
 
-#: fish/cmds.c:243 fish/cmds.c:1343
+#: fish/cmds.c:2798
 msgid "mount a file using the loop device"
 msgstr ""
 
-#: fish/cmds.c:244 fish/cmds.c:1068
+#: fish/cmds.c:2799
 msgid "mount a guest disk with mount options"
 msgstr ""
 
-#: fish/cmds.c:245 fish/cmds.c:1063
+#: fish/cmds.c:2800
 msgid "mount a guest disk, read-only"
 msgstr ""
 
-#: fish/cmds.c:246 fish/cmds.c:1073
+#: fish/cmds.c:2801
 msgid "mount a guest disk with mount options and vfstype"
 msgstr ""
 
-#: fish/cmds.c:247 fish/cmds.c:1433
+#: fish/cmds.c:2802
 msgid "show mountpoints"
 msgstr ""
 
-#: fish/cmds.c:248 fish/cmds.c:928
+#: fish/cmds.c:2803
 msgid "show mounted filesystems"
 msgstr ""
 
-#: fish/cmds.c:249 fish/cmds.c:1143
+#: fish/cmds.c:2804
 msgid "move a file"
 msgstr ""
 
-#: fish/cmds.c:250 fish/cmds.c:1248
+#: fish/cmds.c:2805
 msgid "probe NTFS volume"
 msgstr ""
 
-#: fish/cmds.c:251 fish/cmds.c:1853
+#: fish/cmds.c:2806
 msgid "resize an NTFS filesystem"
 msgstr ""
 
-#: fish/cmds.c:252 fish/cmds.c:1948
+#: fish/cmds.c:2807
 msgid "resize an NTFS filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:253 fish/cmds.c:1743
+#: fish/cmds.c:2808
 msgid "add a partition to the device"
 msgstr ""
 
-#: fish/cmds.c:254 fish/cmds.c:1863
+#: fish/cmds.c:2809
 msgid "delete a partition"
 msgstr ""
 
-#: fish/cmds.c:255 fish/cmds.c:1748
+#: fish/cmds.c:2810
 msgid "partition whole disk with a single primary partition"
 msgstr ""
 
-#: fish/cmds.c:256 fish/cmds.c:1868
+#: fish/cmds.c:2811
 msgid "return true if a partition is bootable"
 msgstr ""
 
-#: fish/cmds.c:257 fish/cmds.c:1873
+#: fish/cmds.c:2812
 msgid "get the MBR type byte (ID byte) from a partition"
 msgstr ""
 
-#: fish/cmds.c:258 fish/cmds.c:1768
+#: fish/cmds.c:2813
 msgid "get the partition table type"
 msgstr ""
 
-#: fish/cmds.c:259 fish/cmds.c:1738
+#: fish/cmds.c:2814
 msgid "create an empty partition table"
 msgstr ""
 
-#: fish/cmds.c:260 fish/cmds.c:1763
+#: fish/cmds.c:2815
 msgid "list partitions on a device"
 msgstr ""
 
-#: fish/cmds.c:261 fish/cmds.c:1753
+#: fish/cmds.c:2816
 msgid "make a partition bootable"
 msgstr ""
 
-#: fish/cmds.c:262 fish/cmds.c:1878
+#: fish/cmds.c:2817
 msgid "set the MBR type byte (ID byte) of a partition"
 msgstr ""
 
-#: fish/cmds.c:263 fish/cmds.c:1758
+#: fish/cmds.c:2818
 msgid "set partition name"
 msgstr ""
 
-#: fish/cmds.c:264 fish/cmds.c:2058
+#: fish/cmds.c:2819
 msgid "convert partition name to device name"
 msgstr ""
 
-#: fish/cmds.c:265 fish/cmds.c:1158
+#: fish/cmds.c:2820
 msgid "ping the guest daemon"
 msgstr ""
 
-#: fish/cmds.c:266 fish/cmds.c:1733
+#: fish/cmds.c:2821
 msgid "read part of a file"
 msgstr ""
 
-#: fish/cmds.c:267 fish/cmds.c:2078
+#: fish/cmds.c:2822
 msgid "read part of a device"
 msgstr ""
 
-#: fish/cmds.c:268 fish/cmds.c:893
+#: fish/cmds.c:2823
 msgid "create an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:269 fish/cmds.c:1093
+#: fish/cmds.c:2824
 msgid "remove an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:270 fish/cmds.c:1188
+#: fish/cmds.c:2825
 msgid "resize an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:271 fish/cmds.c:1943
+#: fish/cmds.c:2826
 msgid "resize an LVM physical volume (with size)"
 msgstr ""
 
-#: fish/cmds.c:272 fish/cmds.c:273 fish/cmds.c:743 fish/cmds.c:758
+#: fish/cmds.c:2827 fish/cmds.c:2828
 msgid "list the LVM physical volumes (PVs)"
 msgstr ""
 
-#: fish/cmds.c:274 fish/cmds.c:1808
+#: fish/cmds.c:2829
 msgid "get the UUID of a physical volume"
 msgstr ""
 
-#: fish/cmds.c:275 fish/cmds.c:1933
+#: fish/cmds.c:2830
 msgid "write to part of a file"
 msgstr ""
 
-#: fish/cmds.c:276 fish/cmds.c:2073
+#: fish/cmds.c:2831
 msgid "write to part of a device"
 msgstr ""
 
-#: fish/cmds.c:277 fish/cmds.c:1448
+#: fish/cmds.c:2832
 msgid "read a file"
 msgstr ""
 
-#: fish/cmds.c:278 fish/cmds.c:773
+#: fish/cmds.c:2833
 msgid "read file as lines"
 msgstr ""
 
-#: fish/cmds.c:279 fish/cmds.c:1388
+#: fish/cmds.c:2834
 msgid "read directories entries"
 msgstr ""
 
-#: fish/cmds.c:280 fish/cmds.c:1538
+#: fish/cmds.c:2835
 msgid "read the target of a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:281 fish/cmds.c:1728
+#: fish/cmds.c:2836
 msgid "readlink on multiple files"
 msgstr ""
 
-#: fish/cmds.c:282 fish/cmds.c:1513
+#: fish/cmds.c:2837
 msgid "canonicalized absolute pathname"
 msgstr ""
 
-#: fish/cmds.c:284 fish/cmds.c:438
+#: fish/cmds.c:2839
 msgid "close and reopen libguestfs handle"
 msgstr ""
 
-#: fish/cmds.c:285 fish/cmds.c:1228
+#: fish/cmds.c:2840
 msgid "resize an ext2, ext3 or ext4 filesystem"
 msgstr ""
 
-#: fish/cmds.c:286 fish/cmds.c:1938
+#: fish/cmds.c:2841
+msgid "resize an ext2, ext3 or ext4 filesystem to the minimum size"
+msgstr ""
+
+#: fish/cmds.c:2842
 msgid "resize an ext2, ext3 or ext4 filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:287 fish/cmds.c:843
+#: fish/cmds.c:2843
 msgid "remove a file"
 msgstr ""
 
-#: fish/cmds.c:288 fish/cmds.c:853
+#: fish/cmds.c:2844
 msgid "remove a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:289 fish/cmds.c:848
+#: fish/cmds.c:2845
 msgid "remove a directory"
 msgstr ""
 
-#: fish/cmds.c:290 fish/cmds.c:1443
+#: fish/cmds.c:2846
 msgid "remove a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:291 fish/cmds.c:1268
+#: fish/cmds.c:2847
 msgid "scrub (securely wipe) a device"
 msgstr ""
 
-#: fish/cmds.c:292 fish/cmds.c:1273
+#: fish/cmds.c:2848
 msgid "scrub (securely wipe) a file"
 msgstr ""
 
-#: fish/cmds.c:293 fish/cmds.c:1278
+#: fish/cmds.c:2849
 msgid "scrub (securely wipe) free space"
 msgstr ""
 
-#: fish/cmds.c:294 fish/cmds.c:508
+#: fish/cmds.c:2850
 msgid "add options to kernel command line"
 msgstr ""
 
-#: fish/cmds.c:295 fish/cmds.c:518
+#: fish/cmds.c:2851
+msgid "set the attach method"
+msgstr ""
+
+#: fish/cmds.c:2852
 msgid "set autosync mode"
 msgstr ""
 
-#: fish/cmds.c:296 fish/cmds.c:603
+#: fish/cmds.c:2853
 msgid "enable or disable direct appliance mode"
 msgstr ""
 
-#: fish/cmds.c:297 fish/cmds.c:1098
+#: fish/cmds.c:2854
 msgid "set the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:298 fish/cmds.c:1108
+#: fish/cmds.c:2855
 msgid "set the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:299 fish/cmds.c:563
+#: fish/cmds.c:2856
 msgid "set memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:300 fish/cmds.c:683
+#: fish/cmds.c:2857
 msgid "set enable network flag"
 msgstr ""
 
-#: fish/cmds.c:301 fish/cmds.c:498
+#: fish/cmds.c:2858
 msgid "set the search path"
 msgstr ""
 
-#: fish/cmds.c:302 fish/cmds.c:488
+#: fish/cmds.c:2859
 msgid "set the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:303 fish/cmds.c:613
+#: fish/cmds.c:2860
 msgid "enable or disable the recovery process"
 msgstr ""
 
-#: fish/cmds.c:304 fish/cmds.c:583
+#: fish/cmds.c:2861
 msgid "set SELinux enabled or disabled at appliance boot"
 msgstr ""
 
-#: fish/cmds.c:305 fish/cmds.c:593
+#: fish/cmds.c:2862
 msgid "enable or disable command traces"
 msgstr ""
 
-#: fish/cmds.c:306 fish/cmds.c:528
+#: fish/cmds.c:2863
 msgid "set verbose mode"
 msgstr ""
 
-#: fish/cmds.c:307 fish/cmds.c:1623
+#: fish/cmds.c:2864
 msgid "set SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:309 fish/cmds.c:310 fish/cmds.c:913 fish/cmds.c:1393
+#: fish/cmds.c:2866 fish/cmds.c:2867
 msgid "create partitions on a block device"
 msgstr ""
 
-#: fish/cmds.c:311 fish/cmds.c:1193
+#: fish/cmds.c:2868
 msgid "modify a single partition on a block device"
 msgstr ""
 
-#: fish/cmds.c:312 fish/cmds.c:1208
+#: fish/cmds.c:2869
 msgid "display the disk geometry from the partition table"
 msgstr ""
 
-#: fish/cmds.c:313 fish/cmds.c:1203
+#: fish/cmds.c:2870
 msgid "display the kernel geometry"
 msgstr ""
 
-#: fish/cmds.c:314 fish/cmds.c:1198
+#: fish/cmds.c:2871
 msgid "display the partition table"
 msgstr ""
 
-#: fish/cmds.c:315 fish/cmds.c:1253
+#: fish/cmds.c:2872
 msgid "run a command via the shell"
 msgstr ""
 
-#: fish/cmds.c:316 fish/cmds.c:1258
+#: fish/cmds.c:2873
 msgid "run a command via the shell returning lines"
 msgstr ""
 
-#: fish/cmds.c:317 fish/cmds.c:1243
+#: fish/cmds.c:2874
 msgid "sleep for some seconds"
 msgstr ""
 
-#: fish/cmds.c:318 fish/cmds.c:443
+#: fish/cmds.c:2875
 msgid "create a sparse disk image and add"
 msgstr ""
 
-#: fish/cmds.c:319 fish/cmds.c:958
+#: fish/cmds.c:2876
 msgid "get file information"
 msgstr ""
 
-#: fish/cmds.c:320 fish/cmds.c:968
+#: fish/cmds.c:2877
 msgid "get file system statistics"
 msgstr ""
 
-#: fish/cmds.c:321 fish/cmds.c:322 fish/cmds.c:1168 fish/cmds.c:1173
+#: fish/cmds.c:2878 fish/cmds.c:2879
 msgid "print the printable strings in a file"
 msgstr ""
 
-#: fish/cmds.c:323 fish/cmds.c:448
+#: fish/cmds.c:2880
 msgid "list supported groups of commands"
 msgstr ""
 
-#: fish/cmds.c:324 fish/cmds.c:1553
+#: fish/cmds.c:2881
 msgid "disable swap on device"
 msgstr ""
 
-#: fish/cmds.c:325 fish/cmds.c:1563
+#: fish/cmds.c:2882
 msgid "disable swap on file"
 msgstr ""
 
-#: fish/cmds.c:326 fish/cmds.c:1573
+#: fish/cmds.c:2883
 msgid "disable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:327 fish/cmds.c:1583
+#: fish/cmds.c:2884
 msgid "disable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:328 fish/cmds.c:1548
+#: fish/cmds.c:2885
 msgid "enable swap on device"
 msgstr ""
 
-#: fish/cmds.c:329 fish/cmds.c:1558
+#: fish/cmds.c:2886
 msgid "enable swap on file"
 msgstr ""
 
-#: fish/cmds.c:330 fish/cmds.c:1568
+#: fish/cmds.c:2887
 msgid "enable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:331 fish/cmds.c:1578
+#: fish/cmds.c:2888
 msgid "enable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:332 fish/cmds.c:708
+#: fish/cmds.c:2889
 msgid "sync disks, writes are flushed through to the disk image"
 msgstr ""
 
-#: fish/cmds.c:333 fish/cmds.c:1313
+#: fish/cmds.c:2890
 msgid "return last 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:334 fish/cmds.c:1318
+#: fish/cmds.c:2891
 msgid "return last N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:335 fish/cmds.c:1043
+#: fish/cmds.c:2892
 msgid "unpack tarfile to directory"
 msgstr ""
 
-#: fish/cmds.c:336 fish/cmds.c:1048
+#: fish/cmds.c:2893
 msgid "pack directory into tarfile"
 msgstr ""
 
-#: fish/cmds.c:337 fish/cmds.c:344 fish/cmds.c:1053 fish/cmds.c:1843
+#: fish/cmds.c:2894 fish/cmds.c:2901
 msgid "unpack compressed tarball to directory"
 msgstr ""
 
-#: fish/cmds.c:338 fish/cmds.c:345 fish/cmds.c:1058 fish/cmds.c:1848
+#: fish/cmds.c:2895 fish/cmds.c:2902
 msgid "pack directory into compressed tarball"
 msgstr ""
 
-#: fish/cmds.c:339 fish/cmds.c:453
+#: fish/cmds.c:2896
 msgid "print elapsed time taken to run a command"
 msgstr ""
 
-#: fish/cmds.c:340 fish/cmds.c:713
+#: fish/cmds.c:2897
 msgid "update file timestamps or create a new file"
 msgstr ""
 
-#: fish/cmds.c:341 fish/cmds.c:1693
+#: fish/cmds.c:2898
 msgid "truncate a file to zero size"
 msgstr ""
 
-#: fish/cmds.c:342 fish/cmds.c:1698
+#: fish/cmds.c:2899
 msgid "truncate a file to a particular size"
 msgstr ""
 
-#: fish/cmds.c:343 fish/cmds.c:973
+#: fish/cmds.c:2900
 msgid "get ext2/ext3/ext4 superblock details"
 msgstr ""
 
-#: fish/cmds.c:346 fish/cmds.c:1383
+#: fish/cmds.c:2903
 msgid "set file mode creation mask (umask)"
 msgstr ""
 
-#: fish/cmds.c:347 fish/cmds.c:923
+#: fish/cmds.c:2904
 msgid "unmount a filesystem"
 msgstr ""
 
-#: fish/cmds.c:348 fish/cmds.c:933
+#: fish/cmds.c:2905
 msgid "unmount all filesystems"
 msgstr ""
 
-#: fish/cmds.c:349 fish/cmds.c:1028
+#: fish/cmds.c:2906
 msgid "upload a file from the local machine"
 msgstr ""
 
-#: fish/cmds.c:350 fish/cmds.c:2063
+#: fish/cmds.c:2907
 msgid "upload a file from the local machine with offset"
 msgstr ""
 
-#: fish/cmds.c:351 fish/cmds.c:1703
+#: fish/cmds.c:2908
 msgid "set timestamp of a file with nanosecond precision"
 msgstr ""
 
-#: fish/cmds.c:352 fish/cmds.c:578
+#: fish/cmds.c:2909
 msgid "get the library version number"
 msgstr ""
 
-#: fish/cmds.c:353 fish/cmds.c:1963
+#: fish/cmds.c:2910
 msgid "get the filesystem label"
 msgstr ""
 
-#: fish/cmds.c:354 fish/cmds.c:1688
+#: fish/cmds.c:2911
 msgid "get the Linux VFS type corresponding to a mounted device"
 msgstr ""
 
-#: fish/cmds.c:355 fish/cmds.c:1968
+#: fish/cmds.c:2912
 msgid "get the filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:356 fish/cmds.c:1218
+#: fish/cmds.c:2913
 msgid "activate or deactivate some volume groups"
 msgstr ""
 
-#: fish/cmds.c:357 fish/cmds.c:1213
+#: fish/cmds.c:2914
 msgid "activate or deactivate all volume groups"
 msgstr ""
 
-#: fish/cmds.c:358 fish/cmds.c:898
+#: fish/cmds.c:2915
 msgid "create an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:359 fish/cmds.c:1828
+#: fish/cmds.c:2916
 msgid "get the LV UUIDs of all LVs in the volume group"
 msgstr ""
 
-#: fish/cmds.c:360 fish/cmds.c:1823
+#: fish/cmds.c:2917
 msgid "get the PV UUIDs containing the volume group"
 msgstr ""
 
-#: fish/cmds.c:361 fish/cmds.c:1088
+#: fish/cmds.c:2918
 msgid "remove an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:362 fish/cmds.c:1798
+#: fish/cmds.c:2919
 msgid "rename an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:363 fish/cmds.c:364 fish/cmds.c:748 fish/cmds.c:763
+#: fish/cmds.c:2920 fish/cmds.c:2921
 msgid "list the LVM volume groups (VGs)"
 msgstr ""
 
-#: fish/cmds.c:365 fish/cmds.c:1858
+#: fish/cmds.c:2922
 msgid "rescan for LVM physical volumes, volume groups and logical volumes"
 msgstr ""
 
-#: fish/cmds.c:366 fish/cmds.c:1813
+#: fish/cmds.c:2923
 msgid "get the UUID of a volume group"
 msgstr ""
 
-#: fish/cmds.c:367 fish/cmds.c:1298
+#: fish/cmds.c:2924
 msgid "count characters in a file"
 msgstr ""
 
-#: fish/cmds.c:368 fish/cmds.c:1288
+#: fish/cmds.c:2925
 msgid "count lines in a file"
 msgstr ""
 
-#: fish/cmds.c:369 fish/cmds.c:1293
+#: fish/cmds.c:2926
 msgid "count words in a file"
 msgstr ""
 
-#: fish/cmds.c:370 fish/cmds.c:1928
+#: fish/cmds.c:2927
 msgid "create a new file"
 msgstr ""
 
-#: fish/cmds.c:371 fish/cmds.c:918
+#: fish/cmds.c:2928
 msgid "create a file"
 msgstr ""
 
-#: fish/cmds.c:374 fish/cmds.c:1123
+#: fish/cmds.c:2931
 msgid "write zeroes to the device"
 msgstr ""
 
-#: fish/cmds.c:375 fish/cmds.c:1838
+#: fish/cmds.c:2932
 msgid "write zeroes to an entire device"
 msgstr ""
 
-#: fish/cmds.c:376 fish/cmds.c:1183
+#: fish/cmds.c:2933
 msgid "zero unused inodes and disk blocks on ext2/3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:379 fish/cmds.c:1398
+#: fish/cmds.c:2936
 msgid "determine file type inside a compressed file"
 msgstr ""
 
-#: fish/cmds.c:382
+#: fish/cmds.c:2939
 msgid "Use -h <cmd> / help <cmd> to show detailed help for a command."
 msgstr ""
 
-#: fish/cmds.c:2359 fish/cmds.c:2372 fish/cmds.c:2387 fish/cmds.c:2403
-#: fish/cmds.c:2419 fish/cmds.c:2436 fish/cmds.c:2454 fish/cmds.c:2469
-#: fish/cmds.c:2486 fish/cmds.c:2501 fish/cmds.c:2518 fish/cmds.c:2533
-#: fish/cmds.c:2549 fish/cmds.c:2563 fish/cmds.c:2580 fish/cmds.c:2594
-#: fish/cmds.c:2609 fish/cmds.c:2624 fish/cmds.c:2639 fish/cmds.c:2654
-#: fish/cmds.c:2669 fish/cmds.c:2686 fish/cmds.c:2718 fish/cmds.c:2733
-#: fish/cmds.c:2748 fish/cmds.c:2766 fish/cmds.c:2780 fish/cmds.c:2797
-#: fish/cmds.c:2811 fish/cmds.c:2828 fish/cmds.c:2842 fish/cmds.c:2859
-#: fish/cmds.c:2873 fish/cmds.c:2891 fish/cmds.c:2909 fish/cmds.c:2926
-#: fish/cmds.c:2945 fish/cmds.c:2963 fish/cmds.c:2982 fish/cmds.c:3001
-#: fish/cmds.c:3020 fish/cmds.c:3038 fish/cmds.c:3056 fish/cmds.c:3075
-#: fish/cmds.c:3094 fish/cmds.c:3113 fish/cmds.c:3127 fish/cmds.c:3142
-#: fish/cmds.c:3206 fish/cmds.c:3221 fish/cmds.c:3236 fish/cmds.c:3254
-#: fish/cmds.c:3275 fish/cmds.c:3296 fish/cmds.c:3315 fish/cmds.c:3331
-#: fish/cmds.c:3347 fish/cmds.c:3363 fish/cmds.c:3379 fish/cmds.c:3395
-#: fish/cmds.c:3411 fish/cmds.c:3427 fish/cmds.c:3445 fish/cmds.c:3467
-#: fish/cmds.c:3502 fish/cmds.c:3518 fish/cmds.c:3540 fish/cmds.c:3561
-#: fish/cmds.c:3581 fish/cmds.c:3600 fish/cmds.c:3618 fish/cmds.c:3637
-#: fish/cmds.c:3654 fish/cmds.c:3671 fish/cmds.c:3684 fish/cmds.c:3699
-#: fish/cmds.c:3718 fish/cmds.c:3736 fish/cmds.c:3754 fish/cmds.c:3772
-#: fish/cmds.c:3790 fish/cmds.c:3809 fish/cmds.c:3848 fish/cmds.c:3904
-#: fish/cmds.c:3924 fish/cmds.c:3944 fish/cmds.c:3964 fish/cmds.c:3981
-#: fish/cmds.c:4002 fish/cmds.c:4039 fish/cmds.c:4060 fish/cmds.c:4138
-#: fish/cmds.c:4176 fish/cmds.c:4190 fish/cmds.c:4206 fish/cmds.c:4219
-#: fish/cmds.c:4234 fish/cmds.c:4255 fish/cmds.c:4276 fish/cmds.c:4297
-#: fish/cmds.c:4318 fish/cmds.c:4339 fish/cmds.c:4360 fish/cmds.c:4379
-#: fish/cmds.c:4395 fish/cmds.c:4411 fish/cmds.c:4429 fish/cmds.c:4447
-#: fish/cmds.c:4466 fish/cmds.c:4501 fish/cmds.c:4519 fish/cmds.c:4537
-#: fish/cmds.c:4553 fish/cmds.c:4570 fish/cmds.c:4592 fish/cmds.c:4614
-#: fish/cmds.c:4637 fish/cmds.c:4659 fish/cmds.c:4679 fish/cmds.c:4701
-#: fish/cmds.c:4723 fish/cmds.c:4742 fish/cmds.c:4763 fish/cmds.c:4783
-#: fish/cmds.c:4805 fish/cmds.c:4821 fish/cmds.c:4837 fish/cmds.c:4854
-#: fish/cmds.c:4871 fish/cmds.c:4891 fish/cmds.c:4908 fish/cmds.c:4928
-#: fish/cmds.c:4947 fish/cmds.c:4964 fish/cmds.c:4984 fish/cmds.c:5006
-#: fish/cmds.c:5028 fish/cmds.c:5049 fish/cmds.c:5081 fish/cmds.c:5097
-#: fish/cmds.c:5113 fish/cmds.c:5136 fish/cmds.c:5158 fish/cmds.c:5180
-#: fish/cmds.c:5201 fish/cmds.c:5217 fish/cmds.c:5238 fish/cmds.c:5331
-#: fish/cmds.c:5350 fish/cmds.c:5369 fish/cmds.c:5388 fish/cmds.c:5405
-#: fish/cmds.c:5425 fish/cmds.c:5460 fish/cmds.c:5476 fish/cmds.c:5497
-#: fish/cmds.c:5513 fish/cmds.c:5548 fish/cmds.c:5567 fish/cmds.c:5586
-#: fish/cmds.c:5605 fish/cmds.c:5626 fish/cmds.c:5642 fish/cmds.c:5660
-#: fish/cmds.c:5678 fish/cmds.c:5699 fish/cmds.c:5719 fish/cmds.c:5739
-#: fish/cmds.c:5759 fish/cmds.c:5781 fish/cmds.c:5821 fish/cmds.c:5843
-#: fish/cmds.c:5881 fish/cmds.c:5897 fish/cmds.c:5915 fish/cmds.c:5935
-#: fish/cmds.c:5957 fish/cmds.c:5978 fish/cmds.c:5995 fish/cmds.c:6013
-#: fish/cmds.c:6033 fish/cmds.c:6109 fish/cmds.c:6149 fish/cmds.c:6227
-#: fish/cmds.c:6302 fish/cmds.c:6338 fish/cmds.c:6360 fish/cmds.c:6380
-#: fish/cmds.c:6402 fish/cmds.c:6423 fish/cmds.c:6447 fish/cmds.c:6489
-#: fish/cmds.c:6529 fish/cmds.c:6549 fish/cmds.c:6566 fish/cmds.c:6584
-#: fish/cmds.c:6600 fish/cmds.c:6617 fish/cmds.c:6643 fish/cmds.c:6666
-#: fish/cmds.c:6689 fish/cmds.c:6712 fish/cmds.c:6735 fish/cmds.c:6758
-#: fish/cmds.c:6781 fish/cmds.c:6804 fish/cmds.c:6827 fish/cmds.c:6850
-#: fish/cmds.c:6873 fish/cmds.c:6896 fish/cmds.c:6918 fish/cmds.c:6940
-#: fish/cmds.c:6960 fish/cmds.c:6980 fish/cmds.c:7000 fish/cmds.c:7019
-#: fish/cmds.c:7041 fish/cmds.c:7078 fish/cmds.c:7094 fish/cmds.c:7110
-#: fish/cmds.c:7128 fish/cmds.c:7146 fish/cmds.c:7162 fish/cmds.c:7178
-#: fish/cmds.c:7194 fish/cmds.c:7210 fish/cmds.c:7228 fish/cmds.c:7263
-#: fish/cmds.c:7302 fish/cmds.c:7334 fish/cmds.c:7350 fish/cmds.c:7366
-#: fish/cmds.c:7381 fish/cmds.c:7395 fish/cmds.c:7415 fish/cmds.c:7452
-#: fish/cmds.c:7489 fish/cmds.c:7527 fish/cmds.c:7566 fish/cmds.c:7606
-#: fish/cmds.c:7646 fish/cmds.c:7683 fish/cmds.c:7699 fish/cmds.c:7721
-#: fish/cmds.c:7742 fish/cmds.c:7763 fish/cmds.c:7782 fish/cmds.c:7801
-#: fish/cmds.c:7836 fish/cmds.c:7907 fish/cmds.c:7946 fish/cmds.c:8003
-#: fish/cmds.c:8028 fish/cmds.c:8053 fish/cmds.c:8080 fish/cmds.c:8138
-#: fish/cmds.c:8158 fish/cmds.c:8202 fish/cmds.c:8221 fish/cmds.c:8259
-#: fish/cmds.c:8295 fish/cmds.c:8314 fish/cmds.c:8335 fish/cmds.c:8391
-#: fish/cmds.c:8410 fish/cmds.c:8431 fish/cmds.c:8452 fish/cmds.c:8470
-#: fish/cmds.c:8489 fish/cmds.c:8515 fish/cmds.c:8534 fish/cmds.c:8553
-#: fish/cmds.c:8572 fish/cmds.c:8591 fish/cmds.c:8612 fish/cmds.c:8646
-#: fish/cmds.c:8663 fish/cmds.c:8685 fish/cmds.c:8706 fish/cmds.c:8720
-#: fish/cmds.c:8736 fish/cmds.c:8772 fish/cmds.c:8810 fish/cmds.c:8849
-#: fish/cmds.c:8904 fish/cmds.c:8925 fish/cmds.c:8960 fish/cmds.c:8974
-#: fish/cmds.c:8993 fish/cmds.c:9032 fish/cmds.c:9054 fish/cmds.c:9077
-#: fish/cmds.c:9101 fish/cmds.c:9141 fish/cmds.c:9165 fish/cmds.c:9202
-#: fish/cmds.c:9232 fish/cmds.c:9262 fish/cmds.c:9289 fish/cmds.c:9308
-#: fish/cmds.c:9339 fish/cmds.c:9358 fish/cmds.c:9377 fish/cmds.c:9393
-#: fish/cmds.c:9410 fish/cmds.c:9432 fish/cmds.c:9452 fish/cmds.c:9470
-#: fish/cmds.c:9511 fish/cmds.c:9553 fish/cmds.c:9596 fish/cmds.c:9634
-#: fish/cmds.c:9652 fish/cmds.c:9671 fish/cmds.c:9690 fish/cmds.c:9710
-#: fish/cmds.c:9730 fish/cmds.c:9750 fish/cmds.c:9770 fish/cmds.c:9790
-#: fish/cmds.c:9811 fish/cmds.c:9848 fish/cmds.c:9898 fish/cmds.c:9935
+#: fish/cmds.c:3257 fish/cmds.c:3271 fish/cmds.c:3287 fish/cmds.c:3304
+#: fish/cmds.c:3321 fish/cmds.c:3339 fish/cmds.c:3358 fish/cmds.c:3374
+#: fish/cmds.c:3392 fish/cmds.c:3408 fish/cmds.c:3426 fish/cmds.c:3442
+#: fish/cmds.c:3459 fish/cmds.c:3474 fish/cmds.c:3492 fish/cmds.c:3507
+#: fish/cmds.c:3523 fish/cmds.c:3539 fish/cmds.c:3555 fish/cmds.c:3571
+#: fish/cmds.c:3587 fish/cmds.c:3605 fish/cmds.c:3638 fish/cmds.c:3654
+#: fish/cmds.c:3670 fish/cmds.c:3689 fish/cmds.c:3704 fish/cmds.c:3722
+#: fish/cmds.c:3737 fish/cmds.c:3755 fish/cmds.c:3770 fish/cmds.c:3788
+#: fish/cmds.c:3803 fish/cmds.c:3822 fish/cmds.c:3841 fish/cmds.c:3859
+#: fish/cmds.c:3879 fish/cmds.c:3898 fish/cmds.c:3918 fish/cmds.c:3938
+#: fish/cmds.c:3958 fish/cmds.c:3977 fish/cmds.c:3996 fish/cmds.c:4016
+#: fish/cmds.c:4036 fish/cmds.c:4056 fish/cmds.c:4071 fish/cmds.c:4087
+#: fish/cmds.c:4159 fish/cmds.c:4177 fish/cmds.c:4194 fish/cmds.c:4278
+#: fish/cmds.c:4298 fish/cmds.c:4318 fish/cmds.c:4338 fish/cmds.c:4358
+#: fish/cmds.c:4378 fish/cmds.c:4397 fish/cmds.c:4416 fish/cmds.c:4435
+#: fish/cmds.c:4450 fish/cmds.c:4469 fish/cmds.c:4489 fish/cmds.c:4509
+#: fish/cmds.c:4530 fish/cmds.c:4546 fish/cmds.c:4562 fish/cmds.c:4581
+#: fish/cmds.c:4603 fish/cmds.c:4625 fish/cmds.c:4645 fish/cmds.c:4662
+#: fish/cmds.c:4679 fish/cmds.c:4696 fish/cmds.c:4713 fish/cmds.c:4730
+#: fish/cmds.c:4747 fish/cmds.c:4764 fish/cmds.c:4783 fish/cmds.c:4806
+#: fish/cmds.c:4842 fish/cmds.c:4859 fish/cmds.c:4882 fish/cmds.c:4904
+#: fish/cmds.c:4925 fish/cmds.c:4945 fish/cmds.c:4964 fish/cmds.c:4984
+#: fish/cmds.c:5002 fish/cmds.c:5020 fish/cmds.c:5034 fish/cmds.c:5050
+#: fish/cmds.c:5070 fish/cmds.c:5089 fish/cmds.c:5108 fish/cmds.c:5127
+#: fish/cmds.c:5146 fish/cmds.c:5166 fish/cmds.c:5206 fish/cmds.c:5263
+#: fish/cmds.c:5284 fish/cmds.c:5305 fish/cmds.c:5326 fish/cmds.c:5344
+#: fish/cmds.c:5366 fish/cmds.c:5404 fish/cmds.c:5426 fish/cmds.c:5505
+#: fish/cmds.c:5544 fish/cmds.c:5559 fish/cmds.c:5576 fish/cmds.c:5590
+#: fish/cmds.c:5606 fish/cmds.c:5628 fish/cmds.c:5650 fish/cmds.c:5672
+#: fish/cmds.c:5694 fish/cmds.c:5716 fish/cmds.c:5738 fish/cmds.c:5758
+#: fish/cmds.c:5775 fish/cmds.c:5792 fish/cmds.c:5811 fish/cmds.c:5830
+#: fish/cmds.c:5850 fish/cmds.c:5886 fish/cmds.c:5905 fish/cmds.c:5924
+#: fish/cmds.c:5941 fish/cmds.c:5959 fish/cmds.c:5982 fish/cmds.c:6005
+#: fish/cmds.c:6029 fish/cmds.c:6052 fish/cmds.c:6073 fish/cmds.c:6096
+#: fish/cmds.c:6119 fish/cmds.c:6139 fish/cmds.c:6161 fish/cmds.c:6182
+#: fish/cmds.c:6205 fish/cmds.c:6222 fish/cmds.c:6239 fish/cmds.c:6257
+#: fish/cmds.c:6275 fish/cmds.c:6296 fish/cmds.c:6314 fish/cmds.c:6335
+#: fish/cmds.c:6355 fish/cmds.c:6373 fish/cmds.c:6394 fish/cmds.c:6417
+#: fish/cmds.c:6440 fish/cmds.c:6462 fish/cmds.c:6495 fish/cmds.c:6512
+#: fish/cmds.c:6529 fish/cmds.c:6553 fish/cmds.c:6576 fish/cmds.c:6599
+#: fish/cmds.c:6621 fish/cmds.c:6638 fish/cmds.c:6660 fish/cmds.c:6754
+#: fish/cmds.c:6774 fish/cmds.c:6794 fish/cmds.c:6814 fish/cmds.c:6832
+#: fish/cmds.c:6853 fish/cmds.c:6889 fish/cmds.c:6906 fish/cmds.c:6928
+#: fish/cmds.c:6945 fish/cmds.c:6981 fish/cmds.c:7001 fish/cmds.c:7021
+#: fish/cmds.c:7041 fish/cmds.c:7063 fish/cmds.c:7080 fish/cmds.c:7099
+#: fish/cmds.c:7118 fish/cmds.c:7140 fish/cmds.c:7161 fish/cmds.c:7182
+#: fish/cmds.c:7203 fish/cmds.c:7226 fish/cmds.c:7267 fish/cmds.c:7290
+#: fish/cmds.c:7329 fish/cmds.c:7346 fish/cmds.c:7365 fish/cmds.c:7386
+#: fish/cmds.c:7409 fish/cmds.c:7431 fish/cmds.c:7449 fish/cmds.c:7468
+#: fish/cmds.c:7489 fish/cmds.c:7566 fish/cmds.c:7607 fish/cmds.c:7686
+#: fish/cmds.c:7762 fish/cmds.c:7799 fish/cmds.c:7822 fish/cmds.c:7843
+#: fish/cmds.c:7866 fish/cmds.c:7888 fish/cmds.c:7913 fish/cmds.c:7956
+#: fish/cmds.c:7997 fish/cmds.c:8018 fish/cmds.c:8036 fish/cmds.c:8055
+#: fish/cmds.c:8072 fish/cmds.c:8090 fish/cmds.c:8117 fish/cmds.c:8141
+#: fish/cmds.c:8165 fish/cmds.c:8189 fish/cmds.c:8213 fish/cmds.c:8237
+#: fish/cmds.c:8261 fish/cmds.c:8285 fish/cmds.c:8309 fish/cmds.c:8333
+#: fish/cmds.c:8357 fish/cmds.c:8381 fish/cmds.c:8404 fish/cmds.c:8427
+#: fish/cmds.c:8448 fish/cmds.c:8469 fish/cmds.c:8490 fish/cmds.c:8510
+#: fish/cmds.c:8533 fish/cmds.c:8571 fish/cmds.c:8588 fish/cmds.c:8605
+#: fish/cmds.c:8624 fish/cmds.c:8643 fish/cmds.c:8660 fish/cmds.c:8677
+#: fish/cmds.c:8694 fish/cmds.c:8711 fish/cmds.c:8730 fish/cmds.c:8766
+#: fish/cmds.c:8806 fish/cmds.c:8839 fish/cmds.c:8856 fish/cmds.c:8873
+#: fish/cmds.c:8889 fish/cmds.c:8904 fish/cmds.c:8925 fish/cmds.c:8963
+#: fish/cmds.c:9001 fish/cmds.c:9040 fish/cmds.c:9080 fish/cmds.c:9121
+#: fish/cmds.c:9162 fish/cmds.c:9200 fish/cmds.c:9217 fish/cmds.c:9240
+#: fish/cmds.c:9262 fish/cmds.c:9284 fish/cmds.c:9304 fish/cmds.c:9324
+#: fish/cmds.c:9360 fish/cmds.c:9432 fish/cmds.c:9472 fish/cmds.c:9530
+#: fish/cmds.c:9556 fish/cmds.c:9582 fish/cmds.c:9610 fish/cmds.c:9669
+#: fish/cmds.c:9690 fish/cmds.c:9735 fish/cmds.c:9755 fish/cmds.c:9794
+#: fish/cmds.c:9831 fish/cmds.c:9851 fish/cmds.c:9873 fish/cmds.c:9930
+#: fish/cmds.c:9950 fish/cmds.c:9972 fish/cmds.c:9994 fish/cmds.c:10013
+#: fish/cmds.c:10033 fish/cmds.c:10060 fish/cmds.c:10080 fish/cmds.c:10100
+#: fish/cmds.c:10120 fish/cmds.c:10140 fish/cmds.c:10162 fish/cmds.c:10197
+#: fish/cmds.c:10215 fish/cmds.c:10238 fish/cmds.c:10260 fish/cmds.c:10275
+#: fish/cmds.c:10292 fish/cmds.c:10329 fish/cmds.c:10368 fish/cmds.c:10408
+#: fish/cmds.c:10464 fish/cmds.c:10486 fish/cmds.c:10522 fish/cmds.c:10537
+#: fish/cmds.c:10557 fish/cmds.c:10597 fish/cmds.c:10620 fish/cmds.c:10644
+#: fish/cmds.c:10669 fish/cmds.c:10710 fish/cmds.c:10735 fish/cmds.c:10773
+#: fish/cmds.c:10804 fish/cmds.c:10835 fish/cmds.c:10863 fish/cmds.c:10883
+#: fish/cmds.c:10915 fish/cmds.c:10935 fish/cmds.c:10955 fish/cmds.c:10972
+#: fish/cmds.c:10990 fish/cmds.c:11013 fish/cmds.c:11034 fish/cmds.c:11053
+#: fish/cmds.c:11095 fish/cmds.c:11138 fish/cmds.c:11182 fish/cmds.c:11221
+#: fish/cmds.c:11240 fish/cmds.c:11260 fish/cmds.c:11280 fish/cmds.c:11301
+#: fish/cmds.c:11322 fish/cmds.c:11343 fish/cmds.c:11364 fish/cmds.c:11385
+#: fish/cmds.c:11407 fish/cmds.c:11445 fish/cmds.c:11496 fish/cmds.c:11534
+#: fish/cmds.c:11590 fish/cmds.c:11680 fish/cmds.c:11709 fish/cmds.c:11736
+#: fish/cmds.c:11753 fish/cmds.c:11774
 #, c-format
 msgid "%s should have %d parameter(s)\n"
 msgstr ""
 
-#: fish/cmds.c:2360 fish/cmds.c:2373 fish/cmds.c:2388 fish/cmds.c:2404
-#: fish/cmds.c:2420 fish/cmds.c:2437 fish/cmds.c:2455 fish/cmds.c:2470
-#: fish/cmds.c:2487 fish/cmds.c:2502 fish/cmds.c:2519 fish/cmds.c:2534
-#: fish/cmds.c:2550 fish/cmds.c:2564 fish/cmds.c:2581 fish/cmds.c:2595
-#: fish/cmds.c:2610 fish/cmds.c:2625 fish/cmds.c:2640 fish/cmds.c:2655
-#: fish/cmds.c:2670 fish/cmds.c:2687 fish/cmds.c:2719 fish/cmds.c:2734
-#: fish/cmds.c:2749 fish/cmds.c:2767 fish/cmds.c:2781 fish/cmds.c:2798
-#: fish/cmds.c:2812 fish/cmds.c:2829 fish/cmds.c:2843 fish/cmds.c:2860
-#: fish/cmds.c:2874 fish/cmds.c:2892 fish/cmds.c:2910 fish/cmds.c:2927
-#: fish/cmds.c:2946 fish/cmds.c:2964 fish/cmds.c:2983 fish/cmds.c:3002
-#: fish/cmds.c:3021 fish/cmds.c:3039 fish/cmds.c:3057 fish/cmds.c:3076
-#: fish/cmds.c:3095 fish/cmds.c:3114 fish/cmds.c:3128 fish/cmds.c:3143
-#: fish/cmds.c:3163 fish/cmds.c:3207 fish/cmds.c:3222 fish/cmds.c:3237
-#: fish/cmds.c:3255 fish/cmds.c:3276 fish/cmds.c:3297 fish/cmds.c:3316
-#: fish/cmds.c:3332 fish/cmds.c:3348 fish/cmds.c:3364 fish/cmds.c:3380
-#: fish/cmds.c:3396 fish/cmds.c:3412 fish/cmds.c:3428 fish/cmds.c:3446
-#: fish/cmds.c:3468 fish/cmds.c:3503 fish/cmds.c:3519 fish/cmds.c:3541
-#: fish/cmds.c:3562 fish/cmds.c:3582 fish/cmds.c:3601 fish/cmds.c:3619
-#: fish/cmds.c:3638 fish/cmds.c:3655 fish/cmds.c:3672 fish/cmds.c:3685
-#: fish/cmds.c:3700 fish/cmds.c:3719 fish/cmds.c:3737 fish/cmds.c:3755
-#: fish/cmds.c:3773 fish/cmds.c:3791 fish/cmds.c:3810 fish/cmds.c:3849
-#: fish/cmds.c:3905 fish/cmds.c:3925 fish/cmds.c:3945 fish/cmds.c:3965
-#: fish/cmds.c:3982 fish/cmds.c:4003 fish/cmds.c:4040 fish/cmds.c:4061
-#: fish/cmds.c:4139 fish/cmds.c:4177 fish/cmds.c:4191 fish/cmds.c:4207
-#: fish/cmds.c:4220 fish/cmds.c:4235 fish/cmds.c:4256 fish/cmds.c:4277
-#: fish/cmds.c:4298 fish/cmds.c:4319 fish/cmds.c:4340 fish/cmds.c:4361
-#: fish/cmds.c:4380 fish/cmds.c:4396 fish/cmds.c:4412 fish/cmds.c:4430
-#: fish/cmds.c:4448 fish/cmds.c:4467 fish/cmds.c:4502 fish/cmds.c:4520
-#: fish/cmds.c:4538 fish/cmds.c:4554 fish/cmds.c:4571 fish/cmds.c:4593
-#: fish/cmds.c:4615 fish/cmds.c:4638 fish/cmds.c:4660 fish/cmds.c:4680
-#: fish/cmds.c:4702 fish/cmds.c:4724 fish/cmds.c:4743 fish/cmds.c:4764
-#: fish/cmds.c:4784 fish/cmds.c:4806 fish/cmds.c:4822 fish/cmds.c:4838
-#: fish/cmds.c:4855 fish/cmds.c:4872 fish/cmds.c:4892 fish/cmds.c:4909
-#: fish/cmds.c:4929 fish/cmds.c:4948 fish/cmds.c:4965 fish/cmds.c:4985
-#: fish/cmds.c:5007 fish/cmds.c:5029 fish/cmds.c:5050 fish/cmds.c:5082
-#: fish/cmds.c:5098 fish/cmds.c:5114 fish/cmds.c:5137 fish/cmds.c:5159
-#: fish/cmds.c:5181 fish/cmds.c:5202 fish/cmds.c:5218 fish/cmds.c:5239
-#: fish/cmds.c:5332 fish/cmds.c:5351 fish/cmds.c:5370 fish/cmds.c:5389
-#: fish/cmds.c:5406 fish/cmds.c:5426 fish/cmds.c:5461 fish/cmds.c:5477
-#: fish/cmds.c:5498 fish/cmds.c:5514 fish/cmds.c:5549 fish/cmds.c:5568
-#: fish/cmds.c:5587 fish/cmds.c:5606 fish/cmds.c:5627 fish/cmds.c:5643
-#: fish/cmds.c:5661 fish/cmds.c:5679 fish/cmds.c:5700 fish/cmds.c:5720
-#: fish/cmds.c:5740 fish/cmds.c:5760 fish/cmds.c:5782 fish/cmds.c:5822
-#: fish/cmds.c:5844 fish/cmds.c:5882 fish/cmds.c:5898 fish/cmds.c:5916
-#: fish/cmds.c:5936 fish/cmds.c:5958 fish/cmds.c:5979 fish/cmds.c:5996
-#: fish/cmds.c:6014 fish/cmds.c:6034 fish/cmds.c:6110 fish/cmds.c:6150
-#: fish/cmds.c:6228 fish/cmds.c:6303 fish/cmds.c:6339 fish/cmds.c:6361
-#: fish/cmds.c:6381 fish/cmds.c:6403 fish/cmds.c:6424 fish/cmds.c:6448
-#: fish/cmds.c:6490 fish/cmds.c:6530 fish/cmds.c:6550 fish/cmds.c:6567
-#: fish/cmds.c:6585 fish/cmds.c:6601 fish/cmds.c:6618 fish/cmds.c:6644
-#: fish/cmds.c:6667 fish/cmds.c:6690 fish/cmds.c:6713 fish/cmds.c:6736
-#: fish/cmds.c:6759 fish/cmds.c:6782 fish/cmds.c:6805 fish/cmds.c:6828
-#: fish/cmds.c:6851 fish/cmds.c:6874 fish/cmds.c:6897 fish/cmds.c:6919
-#: fish/cmds.c:6941 fish/cmds.c:6961 fish/cmds.c:6981 fish/cmds.c:7001
-#: fish/cmds.c:7020 fish/cmds.c:7042 fish/cmds.c:7079 fish/cmds.c:7095
-#: fish/cmds.c:7111 fish/cmds.c:7129 fish/cmds.c:7147 fish/cmds.c:7163
-#: fish/cmds.c:7179 fish/cmds.c:7195 fish/cmds.c:7211 fish/cmds.c:7229
-#: fish/cmds.c:7264 fish/cmds.c:7303 fish/cmds.c:7335 fish/cmds.c:7351
-#: fish/cmds.c:7367 fish/cmds.c:7382 fish/cmds.c:7396 fish/cmds.c:7416
-#: fish/cmds.c:7453 fish/cmds.c:7490 fish/cmds.c:7528 fish/cmds.c:7567
-#: fish/cmds.c:7607 fish/cmds.c:7647 fish/cmds.c:7684 fish/cmds.c:7700
-#: fish/cmds.c:7722 fish/cmds.c:7743 fish/cmds.c:7764 fish/cmds.c:7783
-#: fish/cmds.c:7802 fish/cmds.c:7837 fish/cmds.c:7908 fish/cmds.c:7947
-#: fish/cmds.c:8004 fish/cmds.c:8029 fish/cmds.c:8054 fish/cmds.c:8081
-#: fish/cmds.c:8139 fish/cmds.c:8159 fish/cmds.c:8203 fish/cmds.c:8222
-#: fish/cmds.c:8260 fish/cmds.c:8296 fish/cmds.c:8315 fish/cmds.c:8336
-#: fish/cmds.c:8392 fish/cmds.c:8411 fish/cmds.c:8432 fish/cmds.c:8453
-#: fish/cmds.c:8471 fish/cmds.c:8490 fish/cmds.c:8516 fish/cmds.c:8535
-#: fish/cmds.c:8554 fish/cmds.c:8573 fish/cmds.c:8592 fish/cmds.c:8613
-#: fish/cmds.c:8647 fish/cmds.c:8664 fish/cmds.c:8686 fish/cmds.c:8707
-#: fish/cmds.c:8721 fish/cmds.c:8737 fish/cmds.c:8773 fish/cmds.c:8811
-#: fish/cmds.c:8850 fish/cmds.c:8905 fish/cmds.c:8926 fish/cmds.c:8961
-#: fish/cmds.c:8975 fish/cmds.c:8994 fish/cmds.c:9033 fish/cmds.c:9055
-#: fish/cmds.c:9078 fish/cmds.c:9102 fish/cmds.c:9142 fish/cmds.c:9166
-#: fish/cmds.c:9203 fish/cmds.c:9233 fish/cmds.c:9263 fish/cmds.c:9290
-#: fish/cmds.c:9309 fish/cmds.c:9340 fish/cmds.c:9359 fish/cmds.c:9378
-#: fish/cmds.c:9394 fish/cmds.c:9411 fish/cmds.c:9433 fish/cmds.c:9453
-#: fish/cmds.c:9471 fish/cmds.c:9512 fish/cmds.c:9554 fish/cmds.c:9597
-#: fish/cmds.c:9635 fish/cmds.c:9653 fish/cmds.c:9672 fish/cmds.c:9691
-#: fish/cmds.c:9711 fish/cmds.c:9731 fish/cmds.c:9751 fish/cmds.c:9771
-#: fish/cmds.c:9791 fish/cmds.c:9812 fish/cmds.c:9849 fish/cmds.c:9899
-#: fish/cmds.c:9936
+#: fish/cmds.c:3258 fish/cmds.c:3272 fish/cmds.c:3288 fish/cmds.c:3305
+#: fish/cmds.c:3322 fish/cmds.c:3340 fish/cmds.c:3359 fish/cmds.c:3375
+#: fish/cmds.c:3393 fish/cmds.c:3409 fish/cmds.c:3427 fish/cmds.c:3443
+#: fish/cmds.c:3460 fish/cmds.c:3475 fish/cmds.c:3493 fish/cmds.c:3508
+#: fish/cmds.c:3524 fish/cmds.c:3540 fish/cmds.c:3556 fish/cmds.c:3572
+#: fish/cmds.c:3588 fish/cmds.c:3606 fish/cmds.c:3639 fish/cmds.c:3655
+#: fish/cmds.c:3671 fish/cmds.c:3690 fish/cmds.c:3705 fish/cmds.c:3723
+#: fish/cmds.c:3738 fish/cmds.c:3756 fish/cmds.c:3771 fish/cmds.c:3789
+#: fish/cmds.c:3804 fish/cmds.c:3823 fish/cmds.c:3842 fish/cmds.c:3860
+#: fish/cmds.c:3880 fish/cmds.c:3899 fish/cmds.c:3919 fish/cmds.c:3939
+#: fish/cmds.c:3959 fish/cmds.c:3978 fish/cmds.c:3997 fish/cmds.c:4017
+#: fish/cmds.c:4037 fish/cmds.c:4057 fish/cmds.c:4072 fish/cmds.c:4088
+#: fish/cmds.c:4109 fish/cmds.c:4160 fish/cmds.c:4178 fish/cmds.c:4195
+#: fish/cmds.c:4216 fish/cmds.c:4279 fish/cmds.c:4299 fish/cmds.c:4319
+#: fish/cmds.c:4339 fish/cmds.c:4359 fish/cmds.c:4379 fish/cmds.c:4398
+#: fish/cmds.c:4417 fish/cmds.c:4436 fish/cmds.c:4451 fish/cmds.c:4470
+#: fish/cmds.c:4490 fish/cmds.c:4510 fish/cmds.c:4531 fish/cmds.c:4547
+#: fish/cmds.c:4563 fish/cmds.c:4582 fish/cmds.c:4604 fish/cmds.c:4626
+#: fish/cmds.c:4646 fish/cmds.c:4663 fish/cmds.c:4680 fish/cmds.c:4697
+#: fish/cmds.c:4714 fish/cmds.c:4731 fish/cmds.c:4748 fish/cmds.c:4765
+#: fish/cmds.c:4784 fish/cmds.c:4807 fish/cmds.c:4843 fish/cmds.c:4860
+#: fish/cmds.c:4883 fish/cmds.c:4905 fish/cmds.c:4926 fish/cmds.c:4946
+#: fish/cmds.c:4965 fish/cmds.c:4985 fish/cmds.c:5003 fish/cmds.c:5021
+#: fish/cmds.c:5035 fish/cmds.c:5051 fish/cmds.c:5071 fish/cmds.c:5090
+#: fish/cmds.c:5109 fish/cmds.c:5128 fish/cmds.c:5147 fish/cmds.c:5167
+#: fish/cmds.c:5207 fish/cmds.c:5264 fish/cmds.c:5285 fish/cmds.c:5306
+#: fish/cmds.c:5327 fish/cmds.c:5345 fish/cmds.c:5367 fish/cmds.c:5405
+#: fish/cmds.c:5427 fish/cmds.c:5506 fish/cmds.c:5545 fish/cmds.c:5560
+#: fish/cmds.c:5577 fish/cmds.c:5591 fish/cmds.c:5607 fish/cmds.c:5629
+#: fish/cmds.c:5651 fish/cmds.c:5673 fish/cmds.c:5695 fish/cmds.c:5717
+#: fish/cmds.c:5739 fish/cmds.c:5759 fish/cmds.c:5776 fish/cmds.c:5793
+#: fish/cmds.c:5812 fish/cmds.c:5831 fish/cmds.c:5851 fish/cmds.c:5887
+#: fish/cmds.c:5906 fish/cmds.c:5925 fish/cmds.c:5942 fish/cmds.c:5960
+#: fish/cmds.c:5983 fish/cmds.c:6006 fish/cmds.c:6030 fish/cmds.c:6053
+#: fish/cmds.c:6074 fish/cmds.c:6097 fish/cmds.c:6120 fish/cmds.c:6140
+#: fish/cmds.c:6162 fish/cmds.c:6183 fish/cmds.c:6206 fish/cmds.c:6223
+#: fish/cmds.c:6240 fish/cmds.c:6258 fish/cmds.c:6276 fish/cmds.c:6297
+#: fish/cmds.c:6315 fish/cmds.c:6336 fish/cmds.c:6356 fish/cmds.c:6374
+#: fish/cmds.c:6395 fish/cmds.c:6418 fish/cmds.c:6441 fish/cmds.c:6463
+#: fish/cmds.c:6496 fish/cmds.c:6513 fish/cmds.c:6530 fish/cmds.c:6554
+#: fish/cmds.c:6577 fish/cmds.c:6600 fish/cmds.c:6622 fish/cmds.c:6639
+#: fish/cmds.c:6661 fish/cmds.c:6755 fish/cmds.c:6775 fish/cmds.c:6795
+#: fish/cmds.c:6815 fish/cmds.c:6833 fish/cmds.c:6854 fish/cmds.c:6890
+#: fish/cmds.c:6907 fish/cmds.c:6929 fish/cmds.c:6946 fish/cmds.c:6982
+#: fish/cmds.c:7002 fish/cmds.c:7022 fish/cmds.c:7042 fish/cmds.c:7064
+#: fish/cmds.c:7081 fish/cmds.c:7100 fish/cmds.c:7119 fish/cmds.c:7141
+#: fish/cmds.c:7162 fish/cmds.c:7183 fish/cmds.c:7204 fish/cmds.c:7227
+#: fish/cmds.c:7268 fish/cmds.c:7291 fish/cmds.c:7330 fish/cmds.c:7347
+#: fish/cmds.c:7366 fish/cmds.c:7387 fish/cmds.c:7410 fish/cmds.c:7432
+#: fish/cmds.c:7450 fish/cmds.c:7469 fish/cmds.c:7490 fish/cmds.c:7567
+#: fish/cmds.c:7608 fish/cmds.c:7687 fish/cmds.c:7763 fish/cmds.c:7800
+#: fish/cmds.c:7823 fish/cmds.c:7844 fish/cmds.c:7867 fish/cmds.c:7889
+#: fish/cmds.c:7914 fish/cmds.c:7957 fish/cmds.c:7998 fish/cmds.c:8019
+#: fish/cmds.c:8037 fish/cmds.c:8056 fish/cmds.c:8073 fish/cmds.c:8091
+#: fish/cmds.c:8118 fish/cmds.c:8142 fish/cmds.c:8166 fish/cmds.c:8190
+#: fish/cmds.c:8214 fish/cmds.c:8238 fish/cmds.c:8262 fish/cmds.c:8286
+#: fish/cmds.c:8310 fish/cmds.c:8334 fish/cmds.c:8358 fish/cmds.c:8382
+#: fish/cmds.c:8405 fish/cmds.c:8428 fish/cmds.c:8449 fish/cmds.c:8470
+#: fish/cmds.c:8491 fish/cmds.c:8511 fish/cmds.c:8534 fish/cmds.c:8572
+#: fish/cmds.c:8589 fish/cmds.c:8606 fish/cmds.c:8625 fish/cmds.c:8644
+#: fish/cmds.c:8661 fish/cmds.c:8678 fish/cmds.c:8695 fish/cmds.c:8712
+#: fish/cmds.c:8731 fish/cmds.c:8767 fish/cmds.c:8807 fish/cmds.c:8840
+#: fish/cmds.c:8857 fish/cmds.c:8874 fish/cmds.c:8890 fish/cmds.c:8905
+#: fish/cmds.c:8926 fish/cmds.c:8964 fish/cmds.c:9002 fish/cmds.c:9041
+#: fish/cmds.c:9081 fish/cmds.c:9122 fish/cmds.c:9163 fish/cmds.c:9201
+#: fish/cmds.c:9218 fish/cmds.c:9241 fish/cmds.c:9263 fish/cmds.c:9285
+#: fish/cmds.c:9305 fish/cmds.c:9325 fish/cmds.c:9361 fish/cmds.c:9433
+#: fish/cmds.c:9473 fish/cmds.c:9531 fish/cmds.c:9557 fish/cmds.c:9583
+#: fish/cmds.c:9611 fish/cmds.c:9670 fish/cmds.c:9691 fish/cmds.c:9736
+#: fish/cmds.c:9756 fish/cmds.c:9795 fish/cmds.c:9832 fish/cmds.c:9852
+#: fish/cmds.c:9874 fish/cmds.c:9931 fish/cmds.c:9951 fish/cmds.c:9973
+#: fish/cmds.c:9995 fish/cmds.c:10014 fish/cmds.c:10034 fish/cmds.c:10061
+#: fish/cmds.c:10081 fish/cmds.c:10101 fish/cmds.c:10121 fish/cmds.c:10141
+#: fish/cmds.c:10163 fish/cmds.c:10198 fish/cmds.c:10216 fish/cmds.c:10239
+#: fish/cmds.c:10261 fish/cmds.c:10276 fish/cmds.c:10293 fish/cmds.c:10330
+#: fish/cmds.c:10369 fish/cmds.c:10409 fish/cmds.c:10465 fish/cmds.c:10487
+#: fish/cmds.c:10523 fish/cmds.c:10538 fish/cmds.c:10558 fish/cmds.c:10598
+#: fish/cmds.c:10621 fish/cmds.c:10645 fish/cmds.c:10670 fish/cmds.c:10711
+#: fish/cmds.c:10736 fish/cmds.c:10774 fish/cmds.c:10805 fish/cmds.c:10836
+#: fish/cmds.c:10864 fish/cmds.c:10884 fish/cmds.c:10916 fish/cmds.c:10936
+#: fish/cmds.c:10956 fish/cmds.c:10973 fish/cmds.c:10991 fish/cmds.c:11014
+#: fish/cmds.c:11035 fish/cmds.c:11054 fish/cmds.c:11096 fish/cmds.c:11139
+#: fish/cmds.c:11183 fish/cmds.c:11222 fish/cmds.c:11241 fish/cmds.c:11261
+#: fish/cmds.c:11281 fish/cmds.c:11302 fish/cmds.c:11323 fish/cmds.c:11344
+#: fish/cmds.c:11365 fish/cmds.c:11386 fish/cmds.c:11408 fish/cmds.c:11446
+#: fish/cmds.c:11497 fish/cmds.c:11535 fish/cmds.c:11591 fish/cmds.c:11614
+#: fish/cmds.c:11681 fish/cmds.c:11710 fish/cmds.c:11737 fish/cmds.c:11754
+#: fish/cmds.c:11775
 #, c-format
 msgid "type 'help %s' for help on %s\n"
 msgstr ""
 
-#: fish/cmds.c:2697 fish/cmds.c:3480 fish/cmds.c:3820 fish/cmds.c:3859
-#: fish/cmds.c:3878 fish/cmds.c:4015 fish/cmds.c:4072 fish/cmds.c:4091
-#: fish/cmds.c:4110 fish/cmds.c:4152 fish/cmds.c:4478 fish/cmds.c:5060
-#: fish/cmds.c:5250 fish/cmds.c:5269 fish/cmds.c:5288 fish/cmds.c:5307
-#: fish/cmds.c:5437 fish/cmds.c:5524 fish/cmds.c:5792 fish/cmds.c:5854
-#: fish/cmds.c:6044 fish/cmds.c:6063 fish/cmds.c:6082 fish/cmds.c:6120
-#: fish/cmds.c:6160 fish/cmds.c:6179 fish/cmds.c:6198 fish/cmds.c:6238
-#: fish/cmds.c:6257 fish/cmds.c:6276 fish/cmds.c:6313 fish/cmds.c:6460
-#: fish/cmds.c:6502 fish/cmds.c:7054 fish/cmds.c:7239 fish/cmds.c:7276
-#: fish/cmds.c:7313 fish/cmds.c:7427 fish/cmds.c:7463 fish/cmds.c:7500
-#: fish/cmds.c:7538 fish/cmds.c:7578 fish/cmds.c:7618 fish/cmds.c:7658
-#: fish/cmds.c:7814 fish/cmds.c:7849 fish/cmds.c:7862 fish/cmds.c:7875
-#: fish/cmds.c:7888 fish/cmds.c:7920 fish/cmds.c:7957 fish/cmds.c:7976
-#: fish/cmds.c:8093 fish/cmds.c:8112 fish/cmds.c:8171 fish/cmds.c:8184
-#: fish/cmds.c:8233 fish/cmds.c:8271 fish/cmds.c:8346 fish/cmds.c:8365
-#: fish/cmds.c:8627 fish/cmds.c:8748 fish/cmds.c:8784 fish/cmds.c:8822
-#: fish/cmds.c:8861 fish/cmds.c:8880 fish/cmds.c:8937 fish/cmds.c:9007
-#: fish/cmds.c:9113 fish/cmds.c:9181 fish/cmds.c:9214 fish/cmds.c:9244
-#: fish/cmds.c:9274 fish/cmds.c:9321 fish/cmds.c:9484 fish/cmds.c:9525
-#: fish/cmds.c:9569 fish/cmds.c:9610 fish/cmds.c:9826 fish/cmds.c:9863
-#: fish/cmds.c:9876 fish/cmds.c:9913 fish/cmds.c:9947 fish/cmds.c:9966
+#: fish/cmds.c:3616 fish/cmds.c:4819 fish/cmds.c:5177 fish/cmds.c:5217
+#: fish/cmds.c:5236 fish/cmds.c:5379 fish/cmds.c:5438 fish/cmds.c:5457
+#: fish/cmds.c:5476 fish/cmds.c:5519 fish/cmds.c:5862 fish/cmds.c:6473
+#: fish/cmds.c:6672 fish/cmds.c:6691 fish/cmds.c:6710 fish/cmds.c:6729
+#: fish/cmds.c:6865 fish/cmds.c:6956 fish/cmds.c:7237 fish/cmds.c:7301
+#: fish/cmds.c:7500 fish/cmds.c:7519 fish/cmds.c:7538 fish/cmds.c:7577
+#: fish/cmds.c:7618 fish/cmds.c:7637 fish/cmds.c:7656 fish/cmds.c:7697
+#: fish/cmds.c:7716 fish/cmds.c:7735 fish/cmds.c:7773 fish/cmds.c:7926
+#: fish/cmds.c:7969 fish/cmds.c:8546 fish/cmds.c:8741 fish/cmds.c:8779
+#: fish/cmds.c:8817 fish/cmds.c:8937 fish/cmds.c:8974 fish/cmds.c:9012
+#: fish/cmds.c:9051 fish/cmds.c:9092 fish/cmds.c:9133 fish/cmds.c:9174
+#: fish/cmds.c:9337 fish/cmds.c:9373 fish/cmds.c:9386 fish/cmds.c:9399
+#: fish/cmds.c:9412 fish/cmds.c:9445 fish/cmds.c:9483 fish/cmds.c:9502
+#: fish/cmds.c:9623 fish/cmds.c:9642 fish/cmds.c:9703 fish/cmds.c:9716
+#: fish/cmds.c:9767 fish/cmds.c:9806 fish/cmds.c:9884 fish/cmds.c:9903
+#: fish/cmds.c:10177 fish/cmds.c:10304 fish/cmds.c:10341 fish/cmds.c:10380
+#: fish/cmds.c:10420 fish/cmds.c:10439 fish/cmds.c:10498 fish/cmds.c:10571
+#: fish/cmds.c:10681 fish/cmds.c:10751 fish/cmds.c:10785 fish/cmds.c:10816
+#: fish/cmds.c:10847 fish/cmds.c:10896 fish/cmds.c:11067 fish/cmds.c:11109
+#: fish/cmds.c:11154 fish/cmds.c:11196 fish/cmds.c:11422 fish/cmds.c:11460
+#: fish/cmds.c:11473 fish/cmds.c:11511 fish/cmds.c:11546 fish/cmds.c:11565
+#: fish/cmds.c:11632
 #, c-format
 msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:2703 fish/cmds.c:3486 fish/cmds.c:3826 fish/cmds.c:3865
-#: fish/cmds.c:3884 fish/cmds.c:4021 fish/cmds.c:4078 fish/cmds.c:4097
-#: fish/cmds.c:4116 fish/cmds.c:4158 fish/cmds.c:4484 fish/cmds.c:5066
-#: fish/cmds.c:5256 fish/cmds.c:5275 fish/cmds.c:5294 fish/cmds.c:5313
-#: fish/cmds.c:5443 fish/cmds.c:5530 fish/cmds.c:5798 fish/cmds.c:5860
-#: fish/cmds.c:6050 fish/cmds.c:6069 fish/cmds.c:6088 fish/cmds.c:6126
-#: fish/cmds.c:6166 fish/cmds.c:6185 fish/cmds.c:6204 fish/cmds.c:6244
-#: fish/cmds.c:6263 fish/cmds.c:6282 fish/cmds.c:6319 fish/cmds.c:6466
-#: fish/cmds.c:6508 fish/cmds.c:7060 fish/cmds.c:7245 fish/cmds.c:7282
-#: fish/cmds.c:7319 fish/cmds.c:7433 fish/cmds.c:7469 fish/cmds.c:7506
-#: fish/cmds.c:7544 fish/cmds.c:7584 fish/cmds.c:7624 fish/cmds.c:7664
-#: fish/cmds.c:7926 fish/cmds.c:7963 fish/cmds.c:7982 fish/cmds.c:8099
-#: fish/cmds.c:8239 fish/cmds.c:8277 fish/cmds.c:8352 fish/cmds.c:8371
-#: fish/cmds.c:8754 fish/cmds.c:8790 fish/cmds.c:8828 fish/cmds.c:8867
-#: fish/cmds.c:8886 fish/cmds.c:8943 fish/cmds.c:9013 fish/cmds.c:9119
-#: fish/cmds.c:9490 fish/cmds.c:9531 fish/cmds.c:9575 fish/cmds.c:9616
-#: fish/cmds.c:9953
+#: fish/cmds.c:3622 fish/cmds.c:4825 fish/cmds.c:5183 fish/cmds.c:5223
+#: fish/cmds.c:5242 fish/cmds.c:5385 fish/cmds.c:5444 fish/cmds.c:5463
+#: fish/cmds.c:5482 fish/cmds.c:5525 fish/cmds.c:5868 fish/cmds.c:6479
+#: fish/cmds.c:6678 fish/cmds.c:6697 fish/cmds.c:6716 fish/cmds.c:6735
+#: fish/cmds.c:6871 fish/cmds.c:6962 fish/cmds.c:7243 fish/cmds.c:7307
+#: fish/cmds.c:7506 fish/cmds.c:7525 fish/cmds.c:7544 fish/cmds.c:7583
+#: fish/cmds.c:7624 fish/cmds.c:7643 fish/cmds.c:7662 fish/cmds.c:7703
+#: fish/cmds.c:7722 fish/cmds.c:7741 fish/cmds.c:7779 fish/cmds.c:7932
+#: fish/cmds.c:7975 fish/cmds.c:8552 fish/cmds.c:8747 fish/cmds.c:8785
+#: fish/cmds.c:8823 fish/cmds.c:8943 fish/cmds.c:8980 fish/cmds.c:9018
+#: fish/cmds.c:9057 fish/cmds.c:9098 fish/cmds.c:9139 fish/cmds.c:9180
+#: fish/cmds.c:9451 fish/cmds.c:9489 fish/cmds.c:9508 fish/cmds.c:9629
+#: fish/cmds.c:9773 fish/cmds.c:9812 fish/cmds.c:9890 fish/cmds.c:9909
+#: fish/cmds.c:10310 fish/cmds.c:10347 fish/cmds.c:10386 fish/cmds.c:10426
+#: fish/cmds.c:10445 fish/cmds.c:10504 fish/cmds.c:10577 fish/cmds.c:10687
+#: fish/cmds.c:11073 fish/cmds.c:11115 fish/cmds.c:11160 fish/cmds.c:11202
+#: fish/cmds.c:11552 fish/cmds.c:11638
 #, c-format
 msgid "%s: %s: integer out of range\n"
 msgstr ""
 
-#: fish/cmds.c:3162
+#: fish/cmds.c:4108 fish/cmds.c:4215 fish/cmds.c:11613
 #, c-format
 msgid "%s should have %d-%d parameter(s)\n"
 msgstr ""
 
-#: fish/cmds.c:3187
+#: fish/cmds.c:4134 fish/cmds.c:4251 fish/cmds.c:11653
+#, c-format
+msgid "%s: unknown optional argument \"%s\"\n"
+msgstr ""
+
+#: fish/cmds.c:4140 fish/cmds.c:4257 fish/cmds.c:11659
 #, c-format
-msgid "%s: optional argument %s given twice\n"
+msgid "%s: optional argument \"%s\" given twice\n"
 msgstr ""
 
-#: fish/cmds.c:11003
+#: fish/cmds.c:11794
 #, c-format
 msgid "%s: unknown command\n"
 msgstr ""
 
-#: fish/copy.c:40
+#: fish/config.c:74 fish/config.c:113
+#, c-format
+msgid "%s: %s: line %d: error parsing configuration file: %s\n"
+msgstr ""
+
+#: fish/copy.c:41
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:53 fish/copy.c:194
+#: fish/copy.c:62
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:138
+#: fish/copy.c:157
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:183
+#: fish/copy.c:202
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:224
+#: fish/copy.c:213
 #, c-format
-msgid "copy-out: '%s' is not a file or directory\n"
+msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/edit.c:44
+#: fish/copy.c:258
 #, c-format
-msgid "use '%s filename' to edit a file\n"
+msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
 
-#: fish/fish.c:114 fuse/guestmount.c:881
+#: fish/edit.c:45
 #, c-format
-msgid "Try `%s --help' for more information.\n"
+msgid "use '%s filename' to edit a file\n"
 msgstr ""
 
-#: fish/fish.c:118
+#: fish/fish.c:100
 #, c-format
 msgid ""
 "%s: guest filesystem shell\n"
 "%s lets you edit virtual machine filesystems\n"
-"Copyright (C) 2009-2010 Red Hat Inc.\n"
+"Copyright (C) 2009-2011 Red Hat Inc.\n"
 "Usage:\n"
 "  %s [--options] cmd [: cmd : cmd ...]\n"
-"  %s [--ro] -i -a disk-image\n"
-"  %s [--ro] -i -d libvirt-domain\n"
-"or for interactive use:\n"
-"  %s\n"
-"or from a shell script:\n"
-"  %s <<EOF\n"
-"  cmd\n"
-"  ...\n"
-"  EOF\n"
 "Options:\n"
 "  -h|--cmd-help        List available commands\n"
 "  -h|--cmd-help cmd    Display detailed help on 'cmd'\n"
 "  -a|--add image       Add image\n"
 "  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  --csh                Make --listen csh-compatible\n"
 "  -d|--domain guest    Add disks from libvirt guest\n"
 "  -D|--no-dest-paths   Don't tab-complete paths from guest fs\n"
 "  --echo-keys          Don't turn off echo for passphrases\n"
@@ -1596,7 +1981,8 @@ msgid ""
 "  -i|--inspector       Automatically mount filesystems\n"
 "  --keys-from-stdin    Read passphrases from stdin\n"
 "  --listen             Listen for remote commands\n"
-"  -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
+"  --live               Connect to a live virtual machine\n"
+"  -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
 "  -n|--no-sync         Don't autosync\n"
 "  -N|--new type        Create prepared disk (test1.img, ...)\n"
 "  --progress-bars      Enable progress bars even when not interactive\n"
@@ -1605,124 +1991,114 @@ msgid ""
 "  -r|--ro              Mount read-only\n"
 "  --selinux            Enable SELinux support\n"
 "  -v|--verbose         Verbose messages\n"
-"  -x                   Echo each command before executing it\n"
 "  -V|--version         Display version and exit\n"
+"  -w|--rw              Mount read-write\n"
+"  -x                   Echo each command before executing it\n"
+"\n"
+"To examine a disk image, ISO, hard disk, filesystem etc:\n"
+"  %s [--ro|--rw] -i -a /path/to/disk.img\n"
+"or\n"
+"  %s [--ro|--rw] -i -d name-of-libvirt-domain\n"
+"\n"
+"--ro recommended to avoid any writes to the disk image.  If -i option fails\n"
+"run again without -i and use 'run' + 'list-filesystems' + 'mount' cmds.\n"
+"\n"
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: fish/fish.c:229 fuse/guestmount.c:981
-#, c-format
-msgid "guestfs_create: failed to create handle\n"
-msgstr ""
-
-#: fish/fish.c:268
+#: fish/fish.c:243
 #, c-format
 msgid "%s: --listen=PID: PID was not a number: %s\n"
 msgstr ""
 
-#: fish/fish.c:275
+#: fish/fish.c:250
 #, c-format
 msgid ""
 "%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
 msgstr ""
 
-#: fish/fish.c:297 fuse/guestmount.c:1032
-#, c-format
-msgid "%s: unknown long option: %s (%d)\n"
-msgstr ""
-
-#: fish/fish.c:367
+#: fish/fish.c:300
 #, c-format
 msgid "%s: only one -f parameter can be given\n"
 msgstr ""
 
-#: fish/fish.c:508
+#: fish/fish.c:455
 #, c-format
 msgid "%s: cannot use --listen and --remote options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:516
+#: fish/fish.c:463
 #, c-format
 msgid "%s: extra parameters on the command line with --listen flag\n"
 msgstr ""
 
-#: fish/fish.c:522
+#: fish/fish.c:469
 #, c-format
 msgid "%s: cannot use --listen and --file options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:579
+#: fish/fish.c:527
 #, c-format
 msgid "guestfish: could not access termcap or terminfo database.\n"
 msgstr ""
 
-#: fish/fish.c:583
+#: fish/fish.c:531
 #, c-format
 msgid "guestfish: terminal type \"%s\" not defined.\n"
 msgstr ""
 
-#: fish/fish.c:630
-#, c-format
-msgid "guestfish: '%s' could not be mounted.  Did you mean one of these?\n"
-msgstr ""
-
-#: fish/fish.c:650
-#, c-format
-msgid "guestfish: too many drives added on the command line\n"
-msgstr ""
-
-#: fish/fish.c:825
+#: fish/fish.c:619
 #, c-format
 msgid ""
 "\n"
 "Welcome to guestfish, the libguestfs filesystem interactive shell for\n"
 "editing virtual machine filesystems.\n"
 "\n"
-"Type: 'help' for a list of commands\n"
+"Type: 'help' for help on commands\n"
 "      'man' to read the manual\n"
 "      'quit' to quit the shell\n"
 "\n"
 msgstr ""
 
-#: fish/fish.c:912
+#: fish/fish.c:763
 #, c-format
 msgid "%s: unterminated double quote\n"
 msgstr ""
 
-#: fish/fish.c:918 fish/fish.c:935
+#: fish/fish.c:769 fish/fish.c:786
 #, c-format
 msgid "%s: command arguments not separated by whitespace\n"
 msgstr ""
 
-#: fish/fish.c:929
+#: fish/fish.c:780
 #, c-format
 msgid "%s: unterminated single quote\n"
 msgstr ""
 
-#: fish/fish.c:984
+#: fish/fish.c:810
 #, c-format
 msgid "%s: internal error parsing string at '%s'\n"
 msgstr ""
 
-#: fish/fish.c:1001
+#: fish/fish.c:827
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr ""
 
-#: fish/fish.c:1030
+#: fish/fish.c:895
 #, c-format
 msgid "%s: empty command on command line\n"
 msgstr ""
 
-#: fish/fish.c:1171
+#: fish/fish.c:1041
 msgid "display a list of commands or help on a command"
 msgstr ""
 
-#: fish/fish.c:1173
+#: fish/fish.c:1043
 msgid "quit guestfish"
 msgstr ""
 
-#: fish/fish.c:1184
+#: fish/fish.c:1054
 #, c-format
 msgid ""
 "help - display a list of commands or help on a command\n"
@@ -1730,19 +2106,19 @@ msgid ""
 "     help\n"
 msgstr ""
 
-#: fish/fish.c:1192
+#: fish/fish.c:1062
 #, c-format
 msgid ""
 "quit - quit guestfish\n"
 "     quit\n"
 msgstr ""
 
-#: fish/fish.c:1197
+#: fish/fish.c:1067
 #, c-format
 msgid "%s: command not known, use -h to list all commands\n"
 msgstr ""
 
-#: fish/fish.c:1213
+#: fish/fish.c:1083
 #, c-format
 msgid ""
 "Did you mean to open a disk image?  guestfish -a disk.img\n"
@@ -1750,14 +2126,31 @@ msgid ""
 "For complete documentation:         man guestfish\n"
 msgstr ""
 
-#: fish/fish.c:1370
+#: fish/fish.c:1240
 #, c-format
 msgid "Runaway quote in string \"%s\"\n"
 msgstr ""
 
-#: fish/fish.c:1706
+#: fish/fish.c:1438
 #, c-format
-msgid "Enter key or passphrase (\"%s\"): "
+msgid ""
+"%s: to use Windows drive letters, you must inspect the guest (\"-i\" option "
+"or run \"inspect-os\" command)\n"
+msgstr ""
+
+#: fish/fish.c:1458
+#, c-format
+msgid ""
+"%s: drive '%c:' not found.  To list available drives do:\n"
+"  inspect-get-drive-mappings %s\n"
+msgstr ""
+
+#: fish/fish.c:1477
+#, c-format
+msgid ""
+"%s: to access '%c:', mount %s first.  One way to do this is:\n"
+"  umount-all\n"
+"  mount %s /\n"
 msgstr ""
 
 #: fish/glob.c:53
@@ -1770,20 +2163,45 @@ msgstr ""
 msgid "glob: guestfs_glob_expand call failed: %s\n"
 msgstr ""
 
-#: fish/hexedit.c:41
+#: fish/help.c:38
 #, c-format
-msgid "hexedit (device|filename) [max | start max]\n"
+msgid ""
+"Add disk images to examine using the -a or -d options, or the 'add' "
+"command.\n"
+"Or create a new disk image using -N, or the 'alloc' or 'sparse' commands.\n"
+"Once you have done this, use the 'run' command.\n"
 msgstr ""
 
-#: fish/hexedit.c:52
+#: fish/help.c:44
 #, c-format
-msgid "hexedit: %s is a zero length file or device\n"
+msgid ""
+"Find out what filesystems are available using 'list-filesystems' and then\n"
+"mount them to examine or modify the contents using 'mount-ro' or\n"
+"'mount-options'.\n"
 msgstr ""
 
-#: fish/hexedit.c:63
+#: fish/help.c:52
 #, c-format
 msgid ""
-"hexedit: %s is larger than %s. You must supply a limit using\n"
+"For more information about a command, use 'help cmd'.\n"
+"\n"
+"To read the manual, type 'man'.\n"
+msgstr ""
+
+#: fish/hexedit.c:41
+#, c-format
+msgid "hexedit (device|filename) [max | start max]\n"
+msgstr ""
+
+#: fish/hexedit.c:52
+#, c-format
+msgid "hexedit: %s is a zero length file or device\n"
+msgstr ""
+
+#: fish/hexedit.c:63
+#, c-format
+msgid ""
+"hexedit: %s is larger than %s. You must supply a limit using\n"
 "  'hexedit %s <max>' (eg. 'hexedit %s 1M') or a range using\n"
 "  'hexedit %s <start> <max>'.\n"
 msgstr ""
@@ -1793,47 +2211,71 @@ msgstr ""
 msgid "hexedit: invalid range\n"
 msgstr ""
 
-#: fish/inspect.c:57
+#: fish/inspect.c:77
 #, c-format
-msgid "guestfish: no operating system was found on this disk\n"
+msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:62
+#: fish/inspect.c:89
 #, c-format
-msgid ""
-"guestfish: multi-boot operating systems are not supported by the -i option\n"
+msgid "%s: no operating system was found on this disk\n"
 msgstr ""
 
-#: fish/inspect.c:101
+#: fish/inspect.c:95
+#, c-format
+msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgstr ""
+
+#: fish/inspect.c:134
+#, c-format
+msgid "%s: some filesystems could not be mounted (ignored)\n"
+msgstr ""
+
+#: fish/inspect.c:146
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:114
+#: fish/inspect.c:159
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
 
+#: fish/keys.c:53
+#, c-format
+msgid "Enter key or passphrase (\"%s\"): "
+msgstr ""
+
 #: fish/lcd.c:34
 #, c-format
 msgid "use 'lcd directory' to change local directory\n"
 msgstr ""
 
-#: fish/man.c:34
+#: fish/man.c:35
 #, c-format
 msgid "use 'man' without parameters to open the manual\n"
 msgstr ""
 
-#: fish/man.c:53
+#: fish/man.c:54
 #, c-format
 msgid "the external 'man' program failed\n"
 msgstr ""
 
-#: fish/more.c:39
+#: fish/more.c:40
 #, c-format
 msgid "use '%s filename' to page a file\n"
 msgstr ""
 
+#: fish/options.c:36
+#, c-format
+msgid "%s: too many drives added on the command line\n"
+msgstr ""
+
+#: fish/options.c:128
+#, c-format
+msgid "%s: '%s' could not be mounted.  Did you mean one of these?\n"
+msgstr ""
+
 #: fish/prep.c:37
 #, c-format
 msgid ""
@@ -1949,29 +2391,29 @@ msgstr ""
 msgid "failed to create filesystem (%s): %s"
 msgstr ""
 
-#: fish/rc.c:250
+#: fish/rc.c:255
 #, c-format
 msgid "guestfish: protocol error: could not read 'hello' message\n"
 msgstr ""
 
-#: fish/rc.c:255
+#: fish/rc.c:260
 #, c-format
 msgid ""
 "guestfish: protocol error: version mismatch, server version '%s' does not "
 "match client version '%s'.  The two versions must match exactly.\n"
 msgstr ""
 
-#: fish/rc.c:330 fish/rc.c:344
+#: fish/rc.c:335 fish/rc.c:349
 #, c-format
 msgid "guestfish: remote: looks like the server is not running\n"
 msgstr ""
 
-#: fish/rc.c:356 fish/rc.c:370
+#: fish/rc.c:361 fish/rc.c:375
 #, c-format
 msgid "guestfish: protocol error: could not send initial greeting to server\n"
 msgstr ""
 
-#: fish/rc.c:381
+#: fish/rc.c:386
 #, c-format
 msgid "guestfish: protocol error: could not decode reply from server\n"
 msgstr ""
@@ -1994,177 +2436,149 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: fish/time.c:35
+#: fish/time.c:36
 #, c-format
 msgid "use 'time command [args...]'\n"
 msgstr ""
 
-#: fish/virt.c:70
-#, c-format
-msgid "guestfish: could not connect to libvirt (code %d, domain %d): %s\n"
-msgstr ""
-
-#: fish/virt.c:78
-#, c-format
-msgid "guestfish: no libvirt domain called '%s': %s\n"
-msgstr ""
-
-#: fish/virt.c:86
-#, c-format
-msgid "guestfish: error getting domain info about '%s': %s\n"
-msgstr ""
-
-#: fish/virt.c:91
-#, c-format
-msgid ""
-"guestfish: error: '%s' is a live virtual machine.\n"
-"You must use '--ro' because write access to a running virtual machine can\n"
-"cause disk corruption.\n"
-msgstr ""
-
-#: fish/virt.c:102
-#, c-format
-msgid "guestfish: error reading libvirt XML information about '%s': %s\n"
-msgstr ""
-
-#: fish/virt.c:112
-#, c-format
-msgid "guestfish: unable to parse XML information returned by libvirt\n"
-msgstr ""
-
-#: fish/virt.c:118
-#, c-format
-msgid "guestfish: unable to create new XPath context\n"
-msgstr ""
-
-#: fish/virt.c:125
-#, c-format
-msgid "guestfish: unable to evaluate XPath expression\n"
-msgstr ""
-
-#: fish/virt.c:199
-#, c-format
-msgid "guestfish: libvirt domain '%s' has no disks\n"
-msgstr ""
-
-#: fuse/guestmount.c:885
+#: fuse/guestmount.c:912
 #, c-format
 msgid ""
 "%s: FUSE module for libguestfs\n"
 "%s lets you mount a virtual machine filesystem\n"
-"Copyright (C) 2009 Red Hat Inc.\n"
+"Copyright (C) 2009-2010 Red Hat Inc.\n"
 "Usage:\n"
 "  %s [--options] [-- [--FUSE-options]] mountpoint\n"
 "Options:\n"
 "  -a|--add image       Add image\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
 "  --dir-cache-timeout  Set readdir cache timeout (default 5 sec)\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
 "  --format[=raw|..]    Force disk format for -a option\n"
 "  --fuse-help          Display extra FUSE options\n"
+"  -i|--inspector       Automatically mount filesystems\n"
 "  --help               Display help message and exit\n"
-"  -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  --live               Connect to a live virtual machine\n"
+"  -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
 "  -n|--no-sync         Don't autosync\n"
 "  -o|--option opt      Pass extra option to FUSE\n"
 "  -r|--ro              Mount read-only\n"
 "  --selinux            Enable SELinux support\n"
-"  --trace              Trace guestfs API calls (to stderr)\n"
 "  -v|--verbose         Verbose messages\n"
 "  -V|--version         Display version and exit\n"
+"  -w|--rw              Mount read-write\n"
+"  -x|--trace           Trace guestfs API calls\n"
 msgstr ""
 
-#: fuse/guestmount.c:1107
+#: fuse/guestmount.c:1130
 #, c-format
-msgid "%s: must have at least one -a and at least one -m option\n"
+msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
 msgstr ""
 
-#: fuse/guestmount.c:1115
+#: fuse/guestmount.c:1138
 #, c-format
 msgid "%s: you must specify a mountpoint in the host filesystem\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:218
-msgid "virt-inspector: no image or VM names given"
-msgstr ""
-
-#: inspector/virt-inspector.pl:320
-msgid "--fish output is only possible with a single OS\n"
-msgstr ""
-
-#: inspector/virt-inspector.pl:355
+#: inspector/virt-inspector.c:76
+#, c-format
 msgid ""
-"virt-inspector: no YAML support, try installing perl-YAML or libyaml-perl\n"
-msgstr ""
-
-#: inspector/virt-inspector.pl:394
-msgid "  Mountpoints:\n"
-msgstr ""
-
-#: inspector/virt-inspector.pl:400
-msgid "  Filesystems:\n"
-msgstr ""
-
-#: inspector/virt-inspector.pl:418
-msgid "  Modprobe aliases:\n"
+"%s: display information about a virtual machine\n"
+"Copyright (C) 2010 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname file [file ...]\n"
+"  %s [--options] -a disk.img [-a disk.img ...] file [file ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  --keys-from-stdin    Read passphrases from stdin\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:429
-msgid "  Initrd modules:\n"
+#: inspector/virt-inspector.c:263
+#, c-format
+msgid ""
+"%s: no operating system could be detected inside this disk image.\n"
+"\n"
+"This may be because the file is not a disk image, or is not a virtual "
+"machine\n"
+"image, or because the OS type is not understood by libguestfs.\n"
+"\n"
+"NOTE for Red Hat Enterprise Linux 6 users: for Windows guest support you "
+"must\n"
+"install the separate libguestfs-winsupport package.\n"
+"\n"
+"If you feel this is an error, please file a bug report including as much\n"
+"information about the disk image as possible.\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:438
-msgid "  Applications:\n"
+#: inspector/virt-inspector.c:288
+#, c-format
+msgid "%s: XML write error at \"%s\": %m\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:445
-msgid "  Kernels:\n"
+#: inspector/virt-inspector.c:300
+#, c-format
+msgid "%s: xmlOutputBufferCreateFd: failed to open stdout\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:457
-msgid "  Windows Registry entries:\n"
+#: inspector/virt-inspector.c:308
+#, c-format
+msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:154
+#: perl/lib/Sys/Guestfs/Lib.pm:158
 msgid "open_guest: first parameter must be a string or an arrayref"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:160
+#: perl/lib/Sys/Guestfs/Lib.pm:164
 msgid "open_guest: first argument contains undefined element"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:168
+#: perl/lib/Sys/Guestfs/Lib.pm:172
 #, perl-brace-format
 msgid "guest image {imagename} does not exist or is not readable"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:175
+#: perl/lib/Sys/Guestfs/Lib.pm:179
 msgid ""
 "open_guest: no libvirt support (install Sys::Virt, XML::XPath and XML::"
 "XPath::XMLParser)"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:180
+#: perl/lib/Sys/Guestfs/Lib.pm:184
 msgid "open_guest: too many domains listed on command line"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:187
+#: perl/lib/Sys/Guestfs/Lib.pm:191
 msgid "open_guest: cannot connect to libvirt"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:206
+#: perl/lib/Sys/Guestfs/Lib.pm:210
 #, perl-brace-format
 msgid "{imagename} is not the name of an inactive libvirt domain\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:209
+#: perl/lib/Sys/Guestfs/Lib.pm:213
 #, perl-brace-format
 msgid "{imagename} is not the name of a libvirt domain\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:238
+#: perl/lib/Sys/Guestfs/Lib.pm:242
 #, perl-brace-format
 msgid "{imagename} seems to have no disk devices\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1087
+#: perl/lib/Sys/Guestfs/Lib.pm:827
 msgid ""
 "No operating system could be detected inside this disk image.\n"
 "\n"
@@ -2176,467 +2590,543 @@ msgid ""
 "information about the disk image as possible.\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1160
+#: perl/lib/Sys/Guestfs/Lib.pm:901
 #, perl-brace-format
 msgid "unknown filesystem label {label}\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1170
+#: perl/lib/Sys/Guestfs/Lib.pm:911
 #, perl-brace-format
 msgid "unknown filesystem UUID {uuid}\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1193
+#: perl/lib/Sys/Guestfs/Lib.pm:939
 #, perl-brace-format
 msgid "unknown filesystem {fs}\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1377
+#: perl/lib/Sys/Guestfs/Lib.pm:1017
 #, perl-brace-format
 msgid "Error running rpm -qa: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1403
+#: perl/lib/Sys/Guestfs/Lib.pm:1043
 #, perl-brace-format
 msgid "Error running dpkg-query: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1468
+#: perl/lib/Sys/Guestfs/Lib.pm:1108
 msgid "Can't find grub on guest"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1523
+#: perl/lib/Sys/Guestfs/Lib.pm:1163
 #, perl-brace-format
 msgid "Grub entry {title} has no kernel"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1554
+#: perl/lib/Sys/Guestfs/Lib.pm:1194
 #, perl-brace-format
 msgid "grub refers to {path}, which doesn't exist\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1577
+#: perl/lib/Sys/Guestfs/Lib.pm:1217
 #, perl-brace-format
 msgid "Grub entry {title} does not specify an initrd"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1648
+#: perl/lib/Sys/Guestfs/Lib.pm:1286
 #, perl-brace-format
 msgid "Didn't find modules directory {modules} for kernel {path}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1656
+#: perl/lib/Sys/Guestfs/Lib.pm:1294
 #, perl-brace-format
 msgid "Couldn't guess kernel version number from path for kernel {path}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1710
+#: perl/lib/Sys/Guestfs/Lib.pm:1348
 #, perl-brace-format
 msgid "{path} doesn't match augeas pattern"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1749
+#: perl/lib/Sys/Guestfs/Lib.pm:1387
 #, perl-brace-format
 msgid "{filename}: could not read initrd format"
 msgstr ""
 
-#: src/appliance.c:136
+#: rescue/virt-rescue.c:63
+#, c-format
+msgid ""
+"%s: Run a rescue shell on a virtual machine\n"
+"Copyright (C) 2009-2010 Red Hat Inc.\n"
+"Usage:\n"
+"  %s [--options] -d domname\n"
+"  %s [--options] -a disk.img [-a disk.img ...]\n"
+"Options:\n"
+"  -a|--add image       Add image\n"
+"  --append kernelopts  Append kernel options\n"
+"  -c|--connect uri     Specify libvirt URI for -d option\n"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  -m|--memsize MB      Set memory size in megabytes\n"
+"  --network            Enable network\n"
+"  -r|--ro              Access read-only\n"
+"  --selinux            Enable SELinux\n"
+"  -v|--verbose         Verbose messages\n"
+"  -V|--version         Display version and exit\n"
+"  -w|--rw              Mount read-write\n"
+"  -x                   Trace libguestfs API calls\n"
+"For more information, see the manpage %s(1).\n"
+msgstr ""
+
+#: rescue/virt-rescue.c:180
+#, c-format
+msgid "%s: could not parse memory size '%s'\n"
+msgstr ""
+
+#: rescue/virt-rescue.c:419
+#, c-format
+msgid "%s: unknown child exit status (%d)\n"
+msgstr ""
+
+#: src/appliance.c:181
 #, c-format
 msgid ""
 "cannot find any suitable libguestfs supermin or ordinary appliance on "
 "LIBGUESTFS_PATH (search path: %s)"
 msgstr ""
 
-#: src/appliance.c:389
+#: src/appliance.c:331
+#, c-format
+msgid "security: cached appliance %s is not owned by UID %d"
+msgstr ""
+
+#: src/appliance.c:336
+#, c-format
+msgid "security: cached appliance %s is not a directory (mode %o)"
+msgstr ""
+
+#: src/appliance.c:341
+#, c-format
+msgid "security: cached appliance %s is writable by group or other (mode %o)"
+msgstr ""
+
+#: src/appliance.c:659
 msgid "external command failed, see earlier error messages"
 msgstr ""
 
-#: src/guestfs.c:176
+#: src/dbdump.c:87
+msgid "unexpected end of output from db_dump command before end of header"
+msgstr ""
+
+#: src/dbdump.c:100 src/dbdump.c:112
+msgid "unexpected line from db_dump command, no space prefix"
+msgstr ""
+
+#: src/dbdump.c:129
+msgid "unexpected end of output from db_dump command before end of data"
+msgstr ""
+
+#: src/dbdump.c:210
+msgid "unexpected non-hex digits in output of db_dump command"
+msgstr ""
+
+#: src/filearch.c:153
+#, c-format
+msgid "size of %s unreasonable (%<PRIi64> bytes)"
+msgstr ""
+
+#: src/filearch.c:266
+msgid ""
+"file-architecture API not available since this version of libguestfs was "
+"compiled without PCRE or libmagic libraries"
+msgstr ""
+
+#: src/guestfs.c:174
 #, c-format
 msgid "guestfs_close: called twice on the same handle\n"
 msgstr ""
 
-#: src/guestfs.c:281
+#: src/guestfs.c:340
+#, c-format
+msgid "warning: %s"
+msgstr ""
+
+#: src/guestfs.c:399
 #, c-format
 msgid "libguestfs: error: %s\n"
 msgstr ""
 
-#: src/inspect.c:939
+#: src/guestfs.c:946
 #, c-format
-msgid "cannot resolve Windows %%SYSTEMROOT%%"
+msgid "<truncated, original size %zu bytes>"
+msgstr ""
+
+#: src/inspect.c:265
+msgid "not a Windows guest, or systemroot could not be determined"
 msgstr ""
 
-#: src/inspect.c:1162
+#: src/inspect.c:281
+msgid "not a Windows guest, or CurrentControlSet could not be determined"
+msgstr ""
+
+#: src/inspect.c:519
+#, c-format
+msgid "%s: temporary directory not found"
+msgstr ""
+
+#: src/inspect.c:535 src/inspect_fs.c:474 src/inspect_fs.c:518
+#: src/inspect_fs_unix.c:194 src/inspect_fs_unix.c:579
+#: src/inspect_fs_unix.c:821
+#, c-format
+msgid "size of %s is unreasonably large (%<PRIi64> bytes)"
+msgstr ""
+
+#: src/inspect.c:572
 msgid "no inspection data: call guestfs_inspect_os first"
 msgstr ""
 
-#: src/inspect.c:1174
+#: src/inspect.c:584
 #, c-format
 msgid ""
 "%s: root device not found: only call this function with a root device "
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch.c:94
+#: src/inspect.c:594 src/inspect_apps.c:617
+msgid ""
+"inspection API not available since this version of libguestfs was compiled "
+"without PCRE or hivex libraries"
+msgstr ""
+
+#: src/inspect_fs.c:326 src/inspect_fs.c:339
+#, c-format
+msgid "could not parse integer in version number: %s"
+msgstr ""
+
+#: src/inspect_fs.c:483
+#, c-format
+msgid "%s: file is empty"
+msgstr ""
+
+#: src/inspect_fs_unix.c:613
+msgid "could not parse /etc/fstab or empty file"
+msgstr ""
+
+#: src/inspect_fs_windows.c:112
+#, c-format
+msgid "cannot resolve Windows %%SYSTEMROOT%%"
+msgstr ""
+
+#: src/launch.c:98
 msgid "command line cannot be altered after qemu subprocess launched"
 msgstr ""
 
-#: src/launch.c:108
+#: src/launch.c:155
 msgid "guestfs_config: parameter must begin with '-' character"
 msgstr ""
 
-#: src/launch.c:122
+#: src/launch.c:169
 #, c-format
 msgid "guestfs_config: parameter '%s' isn't allowed"
 msgstr ""
 
-#: src/launch.c:188 src/launch.c:292
+#: src/launch.c:235 src/launch.c:339
 msgid "filename cannot contain ',' (comma) character"
 msgstr ""
 
-#: src/launch.c:200 src/launch.c:205
+#: src/launch.c:247 src/launch.c:252
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/launch.c:318
-msgid "you must call guestfs_add_drive before guestfs_launch"
-msgstr ""
-
-#: src/launch.c:323
+#: src/launch.c:358
 msgid "the libguestfs handle has already been launched"
 msgstr ""
 
-#: src/launch.c:335
+#: src/launch.c:367
 #, c-format
 msgid "%s: cannot create temporary directory"
 msgstr ""
 
-#: src/launch.c:683
+#: src/launch.c:404
+msgid "you must call guestfs_add_drive before guestfs_launch"
+msgstr ""
+
+#: src/launch.c:759
 msgid "guestfs_launch failed, see earlier error messages"
 msgstr ""
 
-#: src/launch.c:696
+#: src/launch.c:772
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch.c:836
+#: src/launch.c:860
+msgid "guestfs_launch failed, unexpected initial message from guestfsd"
+msgstr ""
+
+#: src/launch.c:868
+msgid "contacted guestfsd, but state != READY"
+msgstr ""
+
+#: src/launch.c:1047
 #, c-format
 msgid ""
 "%s: command failed: If qemu is located on a non-standard path, try setting "
 "the LIBGUESTFS_QEMU environment variable."
 msgstr ""
 
-#: src/launch.c:928
+#: src/launch.c:1138
 msgid "qemu has not been launched yet"
 msgstr ""
 
-#: src/launch.c:939
+#: src/launch.c:1149
 msgid "no subprocess to kill"
 msgstr ""
 
-#: src/proto.c:143
+#: src/proto.c:188
 #, c-format
 msgid "guestfs_set_busy: called when in state %d != READY"
 msgstr ""
 
-#: src/proto.c:166
+#: src/proto.c:211
 #, c-format
 msgid "guestfs_end_busy: called when in state %d"
 msgstr ""
 
-#: src/proto.c:281
+#: src/proto.c:421
 #, c-format
 msgid ""
 "check_for_daemon_cancellation_or_eof: read 0x%x from daemon, expected 0x%x\n"
 msgstr ""
 
-#: src/proto.c:453 src/proto.c:514
-msgid "unexpected end of file when reading from daemon"
+#: src/proto.c:543
+msgid ""
+"This usually means the libguestfs appliance failed to start up.  Please\n"
+"enable debugging (LIBGUESTFS_DEBUG=1) and rerun the command, then look at\n"
+"the debug messages output prior to this error.\n"
+msgstr ""
+
+#: src/proto.c:549
+msgid "See earlier debug messages.\n"
 msgstr ""
 
-#: src/proto.c:474
+#: src/proto.c:639
 #, c-format
 msgid "received magic signature from guestfsd, but in state %d"
 msgstr ""
 
-#: src/proto.c:491
+#: src/proto.c:658
 #, c-format
 msgid "message length (%u) > maximum possible size (%d)"
 msgstr ""
 
-#: src/proto.c:641
+#: src/proto.c:810
 #, c-format
 msgid "guestfs___send: state %d != BUSY"
 msgstr ""
 
-#: src/proto.c:663
+#: src/proto.c:834
 msgid "xdr_guestfs_message_header failed"
 msgstr ""
 
-#: src/proto.c:672
+#: src/proto.c:843
 msgid "dispatch failed to marshal args"
 msgstr ""
 
-#: src/proto.c:802
+#: src/proto.c:970
 #, c-format
 msgid "send_file_chunk: state %d != READY"
 msgstr ""
 
-#: src/proto.c:818
+#: src/proto.c:986
 #, c-format
 msgid "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"
 msgstr ""
 
-#: src/proto.c:941
+#: src/proto.c:1136
 #, c-format
 msgid "%s: error in chunked encoding"
 msgstr ""
 
-#: src/proto.c:969
+#: src/proto.c:1163
 msgid "write to daemon socket"
 msgstr ""
 
-#: src/proto.c:992
+#: src/proto.c:1186
 msgid "receive_file_data: parse error in reply callback"
 msgstr ""
 
-#: src/proto.c:997
+#: src/proto.c:1191
 msgid "receive_file_data: unexpected flag received when reading file chunks"
 msgstr ""
 
-#: src/proto.c:1005
+#: src/proto.c:1199
 msgid "failed to parse file chunk"
 msgstr ""
 
-#: src/proto.c:1014
+#: src/proto.c:1208
 msgid "file receive cancelled by daemon"
 msgstr ""
 
-#: test-tool/test-tool.c:82
+#: src/virt.c:101 src/virt.c:347
+msgid "you cannot set both live and readonly flags"
+msgstr ""
+
+#: src/virt.c:109
+#, c-format
+msgid "could not connect to libvirt (code %d, domain %d): %s"
+msgstr ""
+
+#: src/virt.c:130
+#, c-format
+msgid "no libvirt domain called '%s': %s"
+msgstr ""
+
+#: src/virt.c:185 src/virt.c:435
+#, c-format
+msgid "error reading libvirt XML information: %s"
+msgstr ""
+
+#: src/virt.c:195 src/virt.c:443
+msgid "unable to parse XML information returned by libvirt"
+msgstr ""
+
+#: src/virt.c:201 src/virt.c:449
+msgid "unable to create new XPath context"
+msgstr ""
+
+#: src/virt.c:208 src/virt.c:464
+msgid "unable to evaluate XPath expression"
+msgstr ""
+
+#: src/virt.c:305
+msgid "libvirt domain has no disks"
+msgstr ""
+
+#: src/virt.c:358
+#, c-format
+msgid "error getting domain info: %s"
+msgstr ""
+
+#: src/virt.c:372
+msgid ""
+"error: domain is a live virtual machine.\n"
+"Writing to the disks of a running virtual machine can cause disk "
+"corruption.\n"
+"Either use read-only access, or if the guest is running the guestfsd daemon\n"
+"specify live access.  In most libguestfs tools these options are --ro or\n"
+"--live respectively.  Consult the documentation for further information."
+msgstr ""
+
+#: src/virt.c:492
+msgid ""
+"this guest has no libvirt <channel> definition for guestfsd\n"
+"See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
+msgstr ""
+
+#: src/virt.c:517
+msgid ""
+"add-domain API not available since this version of libguestfs was compiled "
+"without libvirt or libxml2"
+msgstr ""
+
+#: test-tool/test-tool.c:79
 #, c-format
 msgid ""
 "libguestfs-test-tool: interactive test tool\n"
-"Copyright (C) 2009 Red Hat Inc.\n"
+"Copyright (C) 2009-2011 Red Hat Inc.\n"
 "Usage:\n"
 "  libguestfs-test-tool [--options]\n"
 "Options:\n"
 "  --help         Display usage\n"
-"  --helper libguestfs-test-tool-helper\n"
-"                 Helper program (default: %s)\n"
 "  --qemudir dir  Specify QEMU source directory\n"
 "  --qemu qemu    Specify QEMU binary\n"
 "  --timeout n\n"
 "  -t n           Set launch timeout (default: %d seconds)\n"
 msgstr ""
 
-#: test-tool/test-tool.c:138
+#: test-tool/test-tool.c:127
 #, c-format
 msgid "libguestfs-test-tool: unknown long option: %s (%d)\n"
 msgstr ""
 
-#: test-tool/test-tool.c:147
+#: test-tool/test-tool.c:136
 #, c-format
 msgid "libguestfs-test-tool: invalid timeout: %s\n"
 msgstr ""
 
-#: test-tool/test-tool.c:159
+#: test-tool/test-tool.c:148
 #, c-format
 msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
 msgstr ""
 
-#: test-tool/test-tool.c:182
+#: test-tool/test-tool.c:170
 #, c-format
 msgid "libguestfs-test-tool: failed to create libguestfs handle\n"
 msgstr ""
 
-#: test-tool/test-tool.c:189 test-tool/test-tool.c:198
+#: test-tool/test-tool.c:177
 #, c-format
 msgid "libguestfs-test-tool: failed to add drive '%s'\n"
 msgstr ""
 
-#: test-tool/test-tool.c:206
+#: test-tool/test-tool.c:185
 #, c-format
 msgid "libguestfs-test-tool: guestfs_version failed\n"
 msgstr ""
 
-#: test-tool/test-tool.c:228
+#: test-tool/test-tool.c:217
 #, c-format
 msgid "libguestfs-test-tool: failed to launch appliance\n"
 msgstr ""
 
-#: test-tool/test-tool.c:240
+#: test-tool/test-tool.c:229
 #, c-format
-msgid "libguestfs-test-tool: failed to run sfdisk\n"
+msgid "libguestfs-test-tool: failed to run part-disk\n"
 msgstr ""
 
-#: test-tool/test-tool.c:246
+#: test-tool/test-tool.c:235
 #, c-format
 msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
 msgstr ""
 
-#: test-tool/test-tool.c:252
+#: test-tool/test-tool.c:241
 #, c-format
 msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
 msgstr ""
 
-#: test-tool/test-tool.c:258
+#: test-tool/test-tool.c:248
 #, c-format
-msgid "libguestfs-test-tool: failed to mkdir /iso\n"
+msgid "libguestfs-test-tool: failed to touch file\n"
 msgstr ""
 
-#: test-tool/test-tool.c:264
-#, c-format
-msgid "libguestfs-test-tool: failed to mount /dev/sdb on /iso\n"
-msgstr ""
-
-#: test-tool/test-tool.c:272
-#, c-format
-msgid "libguestfs-test-tool: could not run helper program, or helper failed\n"
-msgstr ""
-
-#: test-tool/test-tool.c:303
+#: test-tool/test-tool.c:279
 #, c-format
 msgid ""
 "LIBGUESTFS_QEMU environment variable is already set, so\n"
 "--qemu/--qemudir options cannot be used.\n"
 msgstr ""
 
-#: test-tool/test-tool.c:311
+#: test-tool/test-tool.c:287
 #, c-format
 msgid "Binary '%s' does not exist or is not executable\n"
 msgstr ""
 
-#: test-tool/test-tool.c:325
+#: test-tool/test-tool.c:301
 #, c-format
 msgid "%s: does not look like a qemu source directory\n"
 msgstr ""
 
-#: test-tool/test-tool.c:374
-#, c-format
-msgid ""
-"Test tool helper program 'libguestfs-test-tool-helper' is not\n"
-"available.  Expected to find it in '%s'\n"
-"\n"
-"Use the --helper option to specify the location of this program.\n"
-msgstr ""
-
-#: test-tool/test-tool.c:390
-#, c-format
-msgid "command failed: %s"
-msgstr ""
-
-#: test-tool/test-tool.c:398
-#, c-format
-msgid ""
-"Test tool helper program %s\n"
-"is not statically linked.  This is a build error when this test tool\n"
-"was built.\n"
-msgstr ""
-
-#: test-tool/test-tool.c:432
-#, c-format
-msgid "mkisofs command failed: %s\n"
-msgstr ""
-
-#: tools/virt-cat.pl:146
-msgid "virt-cat: no image, VM names or filenames to cat given"
-msgstr ""
-
-#: tools/virt-cat.pl:171
-msgid "multiboot operating systems are not supported by virt-cat"
-msgstr ""
-
-#: tools/virt-df.pl:198
-msgid "virt-df: cannot use -h and --csv options together\n"
-msgstr ""
-
-#: tools/virt-df.pl:261
-#, perl-brace-format
-msgid "{name} is not the name of a libvirt domain\n"
-msgstr ""
-
-#: tools/virt-df.pl:328
-#, perl-brace-format
-msgid "virt-df: ignoring {name}, it has too many disks ({c} > {max})"
-msgstr ""
-
-#: tools/virt-df.pl:495
-msgid "Virtual Machine"
-msgstr ""
-
-#: tools/virt-df.pl:495
-msgid "Filesystem"
-msgstr ""
-
-#: tools/virt-df.pl:498
-msgid "1K-blocks"
-msgstr ""
-
-#: tools/virt-df.pl:500
-msgid "Size"
-msgstr ""
-
-#: tools/virt-df.pl:502
-msgid "Used"
-msgstr ""
-
-#: tools/virt-df.pl:503
-msgid "Available"
-msgstr ""
-
-#: tools/virt-df.pl:504
-msgid "Use%"
-msgstr ""
-
-#: tools/virt-df.pl:506
-msgid "Inodes"
-msgstr ""
-
-#: tools/virt-df.pl:507
-msgid "IUsed"
-msgstr ""
-
-#: tools/virt-df.pl:508
-msgid "IFree"
-msgstr ""
-
-#: tools/virt-df.pl:509
-msgid "IUse%"
-msgstr ""
-
-#: tools/virt-edit.pl:170
-msgid "virt-edit: no image, VM names or filenames to edit given"
-msgstr ""
-
-#: tools/virt-edit.pl:195
-msgid "multiboot operating systems are not supported by virt-edit"
-msgstr ""
-
-#: tools/virt-edit.pl:221
-msgid "File not changed.\n"
-msgstr ""
-
-#: tools/virt-list-filesystems.pl:139
+#: tools/virt-list-filesystems.pl:142
 msgid "virt-list-filesystems: no image or VM name given"
 msgstr ""
 
-#: tools/virt-list-partitions.pl:149
+#: tools/virt-list-partitions.pl:152
 msgid "virt-list-partitions: no image or VM name given"
 msgstr ""
 
-#: tools/virt-ls.pl:154 tools/virt-ls.pl:160
-msgid "virt-ls: cannot combine -l and -R options\n"
-msgstr ""
-
-#: tools/virt-ls.pl:179
-msgid "virt-ls: no image, VM names or directory to list given"
-msgstr ""
-
-#: tools/virt-ls.pl:204
-msgid "multiboot operating systems are not supported by virt-ls\n"
-msgstr ""
-
 #: tools/virt-make-fs.pl:291
 msgid "virt-make-fs input output\n"
 msgstr ""
@@ -2646,7 +3136,7 @@ msgid "unexpected output from 'du' command"
 msgstr ""
 
 #: tools/virt-make-fs.pl:333 tools/virt-make-fs.pl:347
-#: tools/virt-make-fs.pl:453
+#: tools/virt-make-fs.pl:458
 #, perl-brace-format
 msgid "{f}: unknown input format: {fmt}\n"
 msgstr ""
@@ -2656,269 +3146,101 @@ msgstr ""
 msgid "virt-make-fs: cannot parse size parameter: {sz}\n"
 msgstr ""
 
-#: tools/virt-make-fs.pl:401
+#: tools/virt-make-fs.pl:406
 msgid ""
 "qemu-img create: failed to create disk image, see earlier error messages\n"
 msgstr ""
 
-#: tools/virt-make-fs.pl:412
+#: tools/virt-make-fs.pl:417
 msgid "virt-make-fs: NTFS support was disabled when libguestfs was compiled\n"
 msgstr ""
 
-#: tools/virt-make-fs.pl:437
+#: tools/virt-make-fs.pl:442
 msgid "tar: failed, see earlier messages\n"
 msgstr ""
 
-#: tools/virt-make-fs.pl:459
+#: tools/virt-make-fs.pl:464
 msgid "uncompress command failed, see earlier messages\n"
 msgstr ""
 
-#: tools/virt-make-fs.pl:494
+#: tools/virt-make-fs.pl:499
 msgid ""
 "virt-make-fs: error copying contents into filesystem\n"
 "An error here usually means that the program did not estimate the\n"
 "filesystem size correctly.  Please read the BUGS section of the manpage.\n"
 msgstr ""
 
-#: tools/virt-rescue.pl:213
-msgid "virt-rescue: no image or VM names rescue given"
-msgstr ""
-
-#: tools/virt-resize.pl:33
-msgid "virt-resize: sorry this program does not work on a 32 bit host\n"
-msgstr ""
-
-#: tools/virt-resize.pl:584
-#, perl-brace-format
-msgid "virt-resize: {file}: does not exist or is not readable\n"
-msgstr ""
-
-#: tools/virt-resize.pl:586
-#, perl-brace-format
-msgid ""
-"virt-resize: {file}: does not exist or is not writable\n"
-"You have to create the destination disk before running this program.\n"
-"Please read the virt-resize(1) manpage for more information.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:665 tools/virt-resize.pl:668
-#, perl-brace-format
-msgid ""
-"virt-resize: {file}: file is too small to be a disk image ({sz} bytes)\n"
-msgstr ""
-
-#: tools/virt-resize.pl:684 tools/virt-resize.pl:696
-msgid "virt-resize: short read"
-msgstr ""
-
-#: tools/virt-resize.pl:830
-#, perl-brace-format
-msgid "virt-resize: no logical volume called {n}\n"
-msgstr ""
-
-#: tools/virt-resize.pl:850
-#, perl-brace-format
-msgid ""
-"{p}: partition not found in the source disk image, when using the '{opt}' "
-"command line option\n"
-msgstr ""
-
-#: tools/virt-resize.pl:856
-#, perl-brace-format
-msgid ""
-"{p}: partition ignored, you cannot use it in another command line argument\n"
-msgstr ""
-
-#: tools/virt-resize.pl:860
-#, perl-brace-format
-msgid ""
-"{p}: partition deleted, you cannot use it in another command line argument\n"
-msgstr ""
-
-#: tools/virt-resize.pl:902
-#, perl-brace-format
-msgid "{p}: this partition has already been marked for resizing\n"
-msgstr ""
-
-#: tools/virt-resize.pl:910
-#, perl-brace-format
-msgid "{p}: missing size field in {o} option\n"
-msgstr ""
-
-#: tools/virt-resize.pl:927
-#, perl-brace-format
-msgid "{p}: {f}: cannot parse size field\n"
-msgstr ""
-
-#: tools/virt-resize.pl:932
-#, perl-brace-format
-msgid "{p}: new size is zero or negative\n"
-msgstr ""
-
-#: tools/virt-resize.pl:955
-#, perl-brace-format
-msgid ""
-"{p}: cannot make this partition smaller because it contains a\n"
-"filesystem, physical volume or other content that is larger than the new "
-"size.\n"
-"You have to resize the content first, see virt-resize(1).\n"
-msgstr ""
-
-#: tools/virt-resize.pl:971
-msgid "virt-resize: you cannot use options --expand and --shrink together\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1020
-#, perl-brace-format
-msgid ""
-"virt-resize: error: cannot use --expand when there is no surplus space to\n"
-"expand into.  You need to make the target disk larger by at least {h}.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1035
-msgid ""
-"virt-resize: error: cannot use --shrink because there is no deficit\n"
-"(see 'deficit' in the virt-resize(1) man page)\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1050
-msgid "Summary of changes:\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1054
-#, perl-brace-format
-msgid "{p}: partition will be ignored\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1056
-#, perl-brace-format
-msgid "{p}: partition will be deleted\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1058
-#, perl-brace-format
-msgid "{p}: partition will be resized from {oldsize} to {newsize}\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1063
-#, perl-brace-format
-msgid "{p}: content will be expanded using the '{meth}' method\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1068
-#, perl-brace-format
-msgid "{p}: partition will be left alone\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1073
-#, perl-brace-format
-msgid "{n}: LV will be expanded to maximum size\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1079
-#, perl-brace-format
-msgid "{n}: content will be expanded using the '{meth}' method\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1086
-#, perl-brace-format
-msgid "There is a surplus of {spl} bytes ({h}).\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1091
-msgid "An extra partition will be created for the surplus.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1093
-msgid ""
-"The surplus space is not large enough for an extra partition to be created\n"
-"and so it will just be ignored.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1096
-msgid ""
-"The surplus space will be ignored.  Run a partitioning program in the guest\n"
-"to partition this extra space if you want.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1099
-#, perl-brace-format
-msgid ""
-"virt-resize: error: there is a deficit of {def} bytes ({h}).\n"
-"You need to make the target disk larger by at least this amount,\n"
-"or adjust your resizing requests.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1116
-msgid "virt-resize: source disk does not have a first partition\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1211
-#, perl-brace-format
-msgid "Copying {p} ...\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1274 tools/virt-resize.pl:1332
-#, perl-brace-format
-msgid "Expanding {p} using the '{meth}' method\n"
-msgstr ""
-
-#: tools/virt-tar.pl:179 tools/virt-tar.pl:186
+#: tools/virt-tar.pl:183 tools/virt-tar.pl:190
 msgid "virt-tar: extract/upload mode specified twice on the command line\n"
 msgstr ""
 
-#: tools/virt-tar.pl:208
+#: tools/virt-tar.pl:212
 msgid "virt-tar: no image, VM names, directory or filename given"
 msgstr ""
 
-#: tools/virt-tar.pl:211
+#: tools/virt-tar.pl:215
 msgid "virt-tar: either -x or -u must be specified on the command line\n"
 msgstr ""
 
-#: tools/virt-tar.pl:222
+#: tools/virt-tar.pl:226
 #, perl-brace-format
 msgid "virt-tar: {tarball}: file not found\n"
 msgstr ""
 
-#: tools/virt-tar.pl:225
+#: tools/virt-tar.pl:229
 #, perl-brace-format
 msgid "virt-tar: {dir}: directory name must start with '/' character\n"
 msgstr ""
 
-#: tools/virt-tar.pl:248
-msgid "multiboot operating systems are not supported by virt-tar\n"
+#: tools/virt-tar.pl:243 tools/virt-win-reg.pl:259
+#, perl-brace-format
+msgid ""
+"{prog}: No operating system could be detected inside this disk image.\n"
+"\n"
+"This may be because the file is not a disk image, or is not a virtual "
+"machine\n"
+"image, or because the OS type is not understood by libguestfs.\n"
+"\n"
+"If you feel this is an error, please file a bug report including as much\n"
+"information about the disk image as possible.\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:277
-msgid "no libvirt domain name or disk image given\n"
+#: tools/virt-tar.pl:247 tools/virt-win-reg.pl:263
+#, perl-brace-format
+msgid "{prog}: multiboot operating systems are not supported.\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:302
-msgid "multiboot operating systems are not supported by virt-win-reg"
+#: tools/virt-win-reg.pl:243
+msgid "no libvirt domain name or disk image given\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:316
+#: tools/virt-win-reg.pl:285
 msgid ""
 "expecting 1 or 2 more parameters, subkey path and optionally the value to "
 "export\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:427
+#: tools/virt-win-reg.pl:444
+#, perl-brace-format
+msgid "virt-win-reg: {p}: cannot find user directory\n"
+msgstr ""
+
+#: tools/virt-win-reg.pl:449
 #, perl-brace-format
 msgid "virt-win-reg: {p}: not a supported Windows Registry path\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:445 tools/virt-win-reg.pl:468
+#: tools/virt-win-reg.pl:520 tools/virt-win-reg.pl:542
 #, perl-brace-format
 msgid "virt-win-reg: {p}: file not found in guest: {err}\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:452
+#: tools/virt-win-reg.pl:527
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not download registry file: {err}\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:475
+#: tools/virt-win-reg.pl:549
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""