X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=po%2Flibguestfs.pot;h=5698188c63c466e87fc53335ee9f659c29cdc4bd;hb=cd077b8229731e292798f34dd56892cbfa6f1e0e;hp=d1b4fce48dcb0c46a2dfde711260cf504d70d86a;hpb=a50cdb512c31efd75fe09ff6646b02a9a23faa02;p=libguestfs.git

diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index d1b4fce..5698188 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.5.20\n"
+"Project-Id-Version: libguestfs 1.15.11\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2010-09-26 22:40+0100\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\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,322 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: align/scan.c:68 cat/virt-cat.c:61 cat/virt-filesystems.c:100
+#: cat/virt-ls.c:99 df/main.c:70 edit/virt-edit.c:73 fish/fish.c:101
+#: fuse/guestmount.c:908 inspector/virt-inspector.c:78 rescue/virt-rescue.c:62
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: align/scan.c:72
+#, c-format
+msgid ""
+"%s: check alignment of virtual machine partitions\n"
+"Copyright (C) 2011 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"
+"  -d|--domain guest    Add disks from libvirt guest\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
+"  --help               Display brief help\n"
+"  -q|--quiet           No output, just exit code\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 ""
+
+#: align/scan.c:127 cat/virt-cat.c:121 cat/virt-filesystems.c:203
+#: cat/virt-ls.c:192 df/domains.c:429 df/main.c:136 edit/virt-edit.c:141
+#: fish/fish.c:222 fuse/guestmount.c:1024 inspector/virt-inspector.c:140
+#: rescue/virt-rescue.c:142
+#, c-format
+msgid "guestfs_create: failed to create handle\n"
+msgstr ""
+
+#: align/scan.c:145 cat/virt-cat.c:143 cat/virt-filesystems.c:257
+#: cat/virt-ls.c:242 df/main.c:160 edit/virt-edit.c:163 fish/fish.c:279
+#: fuse/guestmount.c:1061 inspector/virt-inspector.c:164
+#: rescue/virt-rescue.c:179
+#, c-format
+msgid "%s: unknown long option: %s (%d)\n"
+msgstr ""
+
+#: align/scan.c:273
+msgid "alignment < 4K"
+msgstr ""
+
+#: align/scan.c:278
+msgid "alignment < 64K"
+msgstr ""
+
+#: cat/virt-cat.c:65
+#, 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:359 edit/virt-edit.c:585 fish/fish.c:1556
+#, c-format
+msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
+msgstr ""
+
+#: cat/virt-cat.c:373 edit/virt-edit.c:599
+#, c-format
+msgid "%s: drive '%c:' not found.\n"
+msgstr ""
+
+#: cat/virt-filesystems.c:104
+#, 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:319 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 ""
+
 #: fish/alloc.c:37
 #, c-format
 msgid "use 'alloc file size' to create an image\n"
@@ -33,1553 +349,1811 @@ msgstr ""
 msgid "can't allocate or add disks after launching\n"
 msgstr ""
 
-#: fish/alloc.c:154
+#: fish/alloc.c:156
 #, c-format
 msgid "%s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2770
 msgid "Command"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2770
 msgid "Description"
 msgstr ""
 
-#: fish/cmds.c:43 fish/cmds.c:471
+#: fish/cmds.c:2772
 msgid "add a CD-ROM disk image to examine"
 msgstr ""
 
-#: fish/cmds.c:44 fish/cmds.c:466
+#: fish/cmds.c:2773
+msgid "add the disk(s) from a named libvirt domain"
+msgstr ""
+
+#: fish/cmds.c:2774 fish/cmds.c:2775
 msgid "add an image to examine or modify"
 msgstr ""
 
-#: fish/cmds.c:45 fish/cmds.c:476
+#: fish/cmds.c:2776
 msgid "add a drive in snapshot mode (read-only)"
 msgstr ""
 
-#: fish/cmds.c:46 fish/cmds.c:626
+#: fish/cmds.c:2777
 msgid "add a drive read-only specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:47 fish/cmds.c:621
+#: fish/cmds.c:2778
 msgid "add a drive specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:48 fish/cmds.c:386
+#: fish/cmds.c:2779
 msgid "allocate and add a disk file"
 msgstr ""
 
-#: fish/cmds.c:49 fish/cmds.c:1886
+#: fish/cmds.c:2780
 msgid "clear Augeas path"
 msgstr ""
 
-#: fish/cmds.c:50 fish/cmds.c:776
+#: fish/cmds.c:2781
 msgid "close the current Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:51 fish/cmds.c:786
+#: fish/cmds.c:2782
 msgid "define an Augeas node"
 msgstr ""
 
-#: fish/cmds.c:52 fish/cmds.c:781
+#: fish/cmds.c:2783
 msgid "define an Augeas variable"
 msgstr ""
 
-#: fish/cmds.c:53 fish/cmds.c:791
+#: fish/cmds.c:2784
 msgid "look up the value of an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:54 fish/cmds.c:771
+#: fish/cmds.c:2785
 msgid "create a new Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:55 fish/cmds.c:801
+#: fish/cmds.c:2786
 msgid "insert a sibling Augeas node"
 msgstr ""
 
-#: fish/cmds.c:56 fish/cmds.c:826
+#: fish/cmds.c:2787
 msgid "load files into the tree"
 msgstr ""
 
-#: fish/cmds.c:57 fish/cmds.c:831
+#: fish/cmds.c:2788
 msgid "list Augeas nodes under augpath"
 msgstr ""
 
-#: fish/cmds.c:58 fish/cmds.c:816
+#: fish/cmds.c:2789
 msgid "return Augeas nodes which match augpath"
 msgstr ""
 
-#: fish/cmds.c:59 fish/cmds.c:811
+#: fish/cmds.c:2790
 msgid "move Augeas node"
 msgstr ""
 
-#: fish/cmds.c:60 fish/cmds.c:806
+#: fish/cmds.c:2791
 msgid "remove an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:61 fish/cmds.c:821
+#: fish/cmds.c:2792
 msgid "write all pending Augeas changes to disk"
 msgstr ""
 
-#: fish/cmds.c:62 fish/cmds.c:796
+#: fish/cmds.c:2793
 msgid "set Augeas path to value"
 msgstr ""
 
-#: fish/cmds.c:63 fish/cmds.c:1771
+#: fish/cmds.c:2794
 msgid "test availability of some parts of the API"
 msgstr ""
 
-#: fish/cmds.c:64 fish/cmds.c:1946
+#: fish/cmds.c:2795
 msgid "return a list of all optional groups"
 msgstr ""
 
-#: fish/cmds.c:65 fish/cmds.c:1901
+#: fish/cmds.c:2796
 msgid "upload base64-encoded data to file"
 msgstr ""
 
-#: fish/cmds.c:66 fish/cmds.c:1906
+#: fish/cmds.c:2797
 msgid "download file and encode as base64"
 msgstr ""
 
-#: fish/cmds.c:67 fish/cmds.c:1011
+#: fish/cmds.c:2798
+msgid "print block device attributes"
+msgstr ""
+
+#: fish/cmds.c:2799
 msgid "flush device buffers"
 msgstr ""
 
-#: fish/cmds.c:68 fish/cmds.c:991
+#: fish/cmds.c:2800
 msgid "get blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:69 fish/cmds.c:981
+#: fish/cmds.c:2801
 msgid "is block device set to read-only"
 msgstr ""
 
-#: fish/cmds.c:70 fish/cmds.c:1006
+#: fish/cmds.c:2802
 msgid "get total size of device in bytes"
 msgstr ""
 
-#: fish/cmds.c:71 fish/cmds.c:986
+#: fish/cmds.c:2803
 msgid "get sectorsize of block device"
 msgstr ""
 
-#: fish/cmds.c:72 fish/cmds.c:1001
+#: fish/cmds.c:2804
 msgid "get total size of device in 512-byte sectors"
 msgstr ""
 
-#: fish/cmds.c:73 fish/cmds.c:1016
+#: fish/cmds.c:2805
 msgid "reread partition table"
 msgstr ""
 
-#: fish/cmds.c:74 fish/cmds.c:996
+#: fish/cmds.c:2806
 msgid "set blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:75 fish/cmds.c:971
+#: fish/cmds.c:2807
 msgid "set block device to read-only"
 msgstr ""
 
-#: fish/cmds.c:76 fish/cmds.c:976
+#: fish/cmds.c:2808
 msgid "set block device to read-write"
 msgstr ""
 
-#: fish/cmds.c:77 fish/cmds.c:1676
+#: fish/cmds.c:2809
+msgid "resize a btrfs filesystem"
+msgstr ""
+
+#: fish/cmds.c:2810
 msgid "return true path on case-insensitive filesystem"
 msgstr ""
 
-#: fish/cmds.c:78 fish/cmds.c:711
+#: fish/cmds.c:2811
 msgid "list the contents of a file"
 msgstr ""
 
-#: fish/cmds.c:79 fish/cmds.c:1031
+#: fish/cmds.c:2812
 msgid "compute MD5, SHAx or CRC checksum of file"
 msgstr ""
 
-#: fish/cmds.c:80 fish/cmds.c:1876
+#: fish/cmds.c:2813
 msgid "compute MD5, SHAx or CRC checksum of the contents of a device"
 msgstr ""
 
-#: fish/cmds.c:81 fish/cmds.c:1911
+#: fish/cmds.c:2814
 msgid "compute MD5, SHAx or CRC checksum of files in a directory"
 msgstr ""
 
-#: fish/cmds.c:82 fish/cmds.c:861
+#: fish/cmds.c:2815
 msgid "change file mode"
 msgstr ""
 
-#: fish/cmds.c:83 fish/cmds.c:183 fish/cmds.c:866 fish/cmds.c:1706
+#: fish/cmds.c:2816 fish/cmds.c:2945
 msgid "change file owner and group"
 msgstr ""
 
-#: fish/cmds.c:84 fish/cmds.c:941
+#: fish/cmds.c:2817
 msgid "run a command from the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:85 fish/cmds.c:946
+#: fish/cmds.c:2818
 msgid "run a command, returning lines"
 msgstr ""
 
-#: fish/cmds.c:86 fish/cmds.c:481
+#: fish/cmds.c:2819
+msgid "output compressed device"
+msgstr ""
+
+#: fish/cmds.c:2820
+msgid "output compressed file"
+msgstr ""
+
+#: fish/cmds.c:2821
 msgid "add qemu parameters"
 msgstr ""
 
-#: fish/cmds.c:87 fish/cmds.c:391
+#: fish/cmds.c:2822
+msgid "copy from source device to destination device"
+msgstr ""
+
+#: fish/cmds.c:2823
+msgid "copy from source device to destination file"
+msgstr ""
+
+#: fish/cmds.c:2824
+msgid "copy from source file to destination device"
+msgstr ""
+
+#: fish/cmds.c:2825
+msgid "copy from source file to destination file"
+msgstr ""
+
+#: fish/cmds.c:2826
 msgid "copy local files or directories into an image"
 msgstr ""
 
-#: fish/cmds.c:88 fish/cmds.c:396
+#: fish/cmds.c:2827
 msgid "copy remote files or directories out of an image"
 msgstr ""
 
-#: fish/cmds.c:89 fish/cmds.c:1826
+#: fish/cmds.c:2828
 msgid "copy size bytes from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:90 fish/cmds.c:1126
+#: fish/cmds.c:2829
 msgid "copy a file"
 msgstr ""
 
-#: fish/cmds.c:91 fish/cmds.c:1131
+#: fish/cmds.c:2830
 msgid "copy a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:92 fish/cmds.c:1776
+#: fish/cmds.c:2831
 msgid "copy from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:93 fish/cmds.c:1071
+#: fish/cmds.c:2832
 msgid "debugging and internals"
 msgstr ""
 
-#: fish/cmds.c:94 fish/cmds.c:1896
+#: fish/cmds.c:2833
+msgid "debug the QEMU command line (internal use only)"
+msgstr ""
+
+#: fish/cmds.c:2834
+msgid "debug the drives (internal use only)"
+msgstr ""
+
+#: fish/cmds.c:2835
 msgid "upload a file to the appliance (internal use only)"
 msgstr ""
 
-#: fish/cmds.c:95 fish/cmds.c:1316
+#: fish/cmds.c:2836
 msgid "report file system disk space usage"
 msgstr ""
 
-#: fish/cmds.c:96 fish/cmds.c:1321
+#: fish/cmds.c:2837
 msgid "report file system disk space usage (human readable)"
 msgstr ""
 
-#: fish/cmds.c:97 fish/cmds.c:1146
+#: fish/cmds.c:2838
+msgid "display an image"
+msgstr ""
+
+#: fish/cmds.c:2839
 msgid "return kernel messages"
 msgstr ""
 
-#: fish/cmds.c:98 fish/cmds.c:1026
+#: fish/cmds.c:2840
 msgid "download a file to the local machine"
 msgstr ""
 
-#: fish/cmds.c:99 fish/cmds.c:2061
+#: fish/cmds.c:2841
 msgid "download a file to the local machine with offset and size"
 msgstr ""
 
-#: fish/cmds.c:100 fish/cmds.c:1141
+#: fish/cmds.c:2842
 msgid "drop kernel page cache, dentries and inodes"
 msgstr ""
 
-#: fish/cmds.c:101 fish/cmds.c:1326
+#: fish/cmds.c:2843
 msgid "estimate file space usage"
 msgstr ""
 
-#: fish/cmds.c:102 fish/cmds.c:1231
+#: fish/cmds.c:2844
 msgid "check an ext2/ext3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:103 fish/cmds.c:401
+#: fish/cmds.c:2845
 msgid "display a line of text"
 msgstr ""
 
-#: fish/cmds.c:104 fish/cmds.c:1666
+#: fish/cmds.c:2846
 msgid "echo arguments back to the client"
 msgstr ""
 
-#: fish/cmds.c:105 fish/cmds.c:406
+#: fish/cmds.c:2847
 msgid "edit a file"
 msgstr ""
 
-#: fish/cmds.c:106 fish/cmds.c:107 fish/cmds.c:112 fish/cmds.c:113
-#: fish/cmds.c:144 fish/cmds.c:145 fish/cmds.c:370 fish/cmds.c:371
-#: fish/cmds.c:375 fish/cmds.c:376 fish/cmds.c:378 fish/cmds.c:379
-#: fish/cmds.c:1446 fish/cmds.c:1451 fish/cmds.c:1456 fish/cmds.c:1461
-#: fish/cmds.c:1466 fish/cmds.c:1471 fish/cmds.c:1476 fish/cmds.c:1481
-#: fish/cmds.c:1486 fish/cmds.c:1491 fish/cmds.c:1496 fish/cmds.c:1501
+#: fish/cmds.c:2848 fish/cmds.c:2849 fish/cmds.c:2854 fish/cmds.c:2855
+#: fish/cmds.c:2890 fish/cmds.c:2891 fish/cmds.c:3153 fish/cmds.c:3154
+#: fish/cmds.c:3158 fish/cmds.c:3159 fish/cmds.c:3161 fish/cmds.c:3162
 msgid "return lines matching a pattern"
 msgstr ""
 
-#: fish/cmds.c:108 fish/cmds.c:1156
+#: fish/cmds.c:2850
 msgid "test if two files have equal contents"
 msgstr ""
 
-#: fish/cmds.c:109 fish/cmds.c:871
+#: fish/cmds.c:2851
 msgid "test if file or directory exists"
 msgstr ""
 
-#: fish/cmds.c:110 fish/cmds.c:111 fish/cmds.c:1536 fish/cmds.c:1951
+#: fish/cmds.c:2852 fish/cmds.c:2853
 msgid "preallocate a file in the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:114 fish/cmds.c:936
+#: fish/cmds.c:2856
 msgid "determine file type"
 msgstr ""
 
-#: fish/cmds.c:115 fish/cmds.c:631
+#: fish/cmds.c:2857
 msgid "detect the architecture of a binary file"
 msgstr ""
 
-#: fish/cmds.c:116 fish/cmds.c:1781
+#: fish/cmds.c:2858
 msgid "return the size of the file in bytes"
 msgstr ""
 
-#: fish/cmds.c:117 fish/cmds.c:1766
+#: fish/cmds.c:2859
 msgid "fill a file with octets"
 msgstr ""
 
-#: fish/cmds.c:118 fish/cmds.c:1916
+#: fish/cmds.c:2860
 msgid "fill a file with a repeating pattern of bytes"
 msgstr ""
 
-#: fish/cmds.c:119 fish/cmds.c:1226
+#: fish/cmds.c:2861
 msgid "find all files and directories"
 msgstr ""
 
-#: fish/cmds.c:120 fish/cmds.c:1671
+#: fish/cmds.c:2862
 msgid "find all files and directories, returning NUL-separated list"
 msgstr ""
 
-#: fish/cmds.c:121 fish/cmds.c:2021
+#: fish/cmds.c:2863
 msgid "find a filesystem by label"
 msgstr ""
 
-#: fish/cmds.c:122 fish/cmds.c:2016
+#: fish/cmds.c:2864
 msgid "find a filesystem by UUID"
 msgstr ""
 
-#: fish/cmds.c:123 fish/cmds.c:1111
+#: fish/cmds.c:2865
 msgid "run the filesystem checker"
 msgstr ""
 
-#: fish/cmds.c:124 fish/cmds.c:511
+#: fish/cmds.c:2866
 msgid "get the additional kernel options"
 msgstr ""
 
-#: fish/cmds.c:125 fish/cmds.c:521
+#: fish/cmds.c:2867
+msgid "get the attach method"
+msgstr ""
+
+#: fish/cmds.c:2868
 msgid "get autosync mode"
 msgstr ""
 
-#: fish/cmds.c:126 fish/cmds.c:606
+#: fish/cmds.c:2869
 msgid "get direct appliance mode flag"
 msgstr ""
 
-#: fish/cmds.c:127 fish/cmds.c:1096
+#: fish/cmds.c:2870
 msgid "get the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:128 fish/cmds.c:1106
+#: fish/cmds.c:2871
 msgid "get the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:129 fish/cmds.c:566
+#: fish/cmds.c:2872
 msgid "get memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:130 fish/cmds.c:686
+#: fish/cmds.c:2873
 msgid "get enable network flag"
 msgstr ""
 
-#: fish/cmds.c:131 fish/cmds.c:501
+#: fish/cmds.c:2874
 msgid "get the search path"
 msgstr ""
 
-#: fish/cmds.c:132 fish/cmds.c:571
+#: fish/cmds.c:2875
+msgid "get process group flag"
+msgstr ""
+
+#: fish/cmds.c:2876
 msgid "get PID of qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:133 fish/cmds.c:491
+#: fish/cmds.c:2877
 msgid "get the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:134 fish/cmds.c:616
+#: fish/cmds.c:2878
 msgid "get recovery process enabled flag"
 msgstr ""
 
-#: fish/cmds.c:135 fish/cmds.c:586
+#: fish/cmds.c:2879
 msgid "get SELinux enabled flag"
 msgstr ""
 
-#: fish/cmds.c:136 fish/cmds.c:556
+#: fish/cmds.c:2880
+msgid "get number of virtual CPUs in appliance"
+msgstr ""
+
+#: fish/cmds.c:2881
 msgid "get the current state"
 msgstr ""
 
-#: fish/cmds.c:137 fish/cmds.c:596
+#: fish/cmds.c:2882
 msgid "get command trace enabled flag"
 msgstr ""
 
-#: fish/cmds.c:138 fish/cmds.c:1891
+#: fish/cmds.c:2883
 msgid "get the current umask"
 msgstr ""
 
-#: fish/cmds.c:139 fish/cmds.c:531
+#: fish/cmds.c:2884
 msgid "get verbose mode"
 msgstr ""
 
-#: fish/cmds.c:140 fish/cmds.c:1621
+#: fish/cmds.c:2885
 msgid "get SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:141 fish/cmds.c:184 fish/cmds.c:1396 fish/cmds.c:1401
+#: fish/cmds.c:2886 fish/cmds.c:2946
+msgid "get a single extended attribute"
+msgstr ""
+
+#: fish/cmds.c:2887 fish/cmds.c:2947
 msgid "list extended attributes of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:142 fish/cmds.c:411
+#: fish/cmds.c:2888
 msgid "expand wildcards in command"
 msgstr ""
 
-#: fish/cmds.c:143 fish/cmds.c:1256
+#: fish/cmds.c:2889
 msgid "expand a wildcard path"
 msgstr ""
 
-#: fish/cmds.c:146 fish/cmds.c:1121
-msgid "install GRUB"
+#: fish/cmds.c:2892
+msgid "install GRUB 1"
 msgstr ""
 
-#: fish/cmds.c:147 fish/cmds.c:1296
+#: fish/cmds.c:2893
 msgid "return first 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:148 fish/cmds.c:1301
+#: fish/cmds.c:2894
 msgid "return first N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:149 fish/cmds.c:1171
+#: fish/cmds.c:2895
 msgid "dump a file in hexadecimal"
 msgstr ""
 
-#: fish/cmds.c:150 fish/cmds.c:416
+#: fish/cmds.c:2896
 msgid "edit with a hex editor"
 msgstr ""
 
-#: fish/cmds.c:151 fish/cmds.c:1796
+#: fish/cmds.c:2897
 msgid "list the contents of a single file in an initrd"
 msgstr ""
 
-#: fish/cmds.c:152 fish/cmds.c:1331
+#: fish/cmds.c:2898
 msgid "list files in an initrd"
 msgstr ""
 
-#: fish/cmds.c:153 fish/cmds.c:1591
+#: fish/cmds.c:2899
 msgid "add an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:154 fish/cmds.c:1611
+#: fish/cmds.c:2900
 msgid "close the inotify handle"
 msgstr ""
 
-#: fish/cmds.c:155 fish/cmds.c:1606
+#: fish/cmds.c:2901
 msgid "return list of watched files that had events"
 msgstr ""
 
-#: fish/cmds.c:156 fish/cmds.c:1586
+#: fish/cmds.c:2902
 msgid "create an inotify handle"
 msgstr ""
 
-#: fish/cmds.c:157 fish/cmds.c:1601
+#: fish/cmds.c:2903
 msgid "return list of inotify events"
 msgstr ""
 
-#: fish/cmds.c:158 fish/cmds.c:1596
+#: fish/cmds.c:2904
 msgid "remove an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:159 fish/cmds.c:646
+#: fish/cmds.c:2905
 msgid "get architecture of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:160 fish/cmds.c:651
+#: fish/cmds.c:2906
 msgid "get distro of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:161 fish/cmds.c:676
+#: fish/cmds.c:2907
+msgid "get drive letter mappings"
+msgstr ""
+
+#: fish/cmds.c:2908
 msgid "get filesystems associated with inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:162 fish/cmds.c:656
+#: fish/cmds.c:2909
+msgid "get format of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2910
+msgid "get hostname of the operating system"
+msgstr ""
+
+#: fish/cmds.c:2911
+msgid "get the icon corresponding to this operating system"
+msgstr ""
+
+#: fish/cmds.c:2912
 msgid "get major version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:163 fish/cmds.c:661
+#: fish/cmds.c:2913
 msgid "get minor version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:164 fish/cmds.c:671
+#: fish/cmds.c:2914
 msgid "get mountpoints of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:165 fish/cmds.c:666
+#: fish/cmds.c:2915
+msgid "get package format used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2916
+msgid "get package management tool used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2917
 msgid "get product name of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:166 fish/cmds.c:641
+#: fish/cmds.c:2918
+msgid "get product variant of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2919
+msgid "return list of operating systems found by last inspection"
+msgstr ""
+
+#: fish/cmds.c:2920
 msgid "get type of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:167 fish/cmds.c:636
+#: fish/cmds.c:2921
+msgid "get Windows CurrentControlSet of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2922
+msgid "get Windows systemroot of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2923
+msgid "get live flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2924
+msgid "get multipart flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2925
+msgid "get netinst (network installer) flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2926
+msgid "get list of applications installed in the operating system"
+msgstr ""
+
+#: fish/cmds.c:2927
 msgid "inspect disk and return list of operating systems found"
 msgstr ""
 
-#: fish/cmds.c:168 fish/cmds.c:2031
+#: fish/cmds.c:2928
 msgid "test if block device"
 msgstr ""
 
-#: fish/cmds.c:169 fish/cmds.c:551
+#: fish/cmds.c:2929
 msgid "is busy processing a command"
 msgstr ""
 
-#: fish/cmds.c:170 fish/cmds.c:2026
+#: fish/cmds.c:2930
 msgid "test if character device"
 msgstr ""
 
-#: fish/cmds.c:171 fish/cmds.c:541
+#: fish/cmds.c:2931
 msgid "is in configuration state"
 msgstr ""
 
-#: fish/cmds.c:172 fish/cmds.c:881
+#: fish/cmds.c:2932
 msgid "test if a directory"
 msgstr ""
 
-#: fish/cmds.c:173 fish/cmds.c:2036
+#: fish/cmds.c:2933
 msgid "test if FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:174 fish/cmds.c:876
+#: fish/cmds.c:2934
 msgid "test if a regular file"
 msgstr ""
 
-#: fish/cmds.c:175 fish/cmds.c:546
+#: fish/cmds.c:2935
 msgid "is launching subprocess"
 msgstr ""
 
-#: fish/cmds.c:176 fish/cmds.c:2011
+#: fish/cmds.c:2936
 msgid "test if device is a logical volume"
 msgstr ""
 
-#: fish/cmds.c:177 fish/cmds.c:536
+#: fish/cmds.c:2937
 msgid "is ready to accept commands"
 msgstr ""
 
-#: fish/cmds.c:178 fish/cmds.c:2046
+#: fish/cmds.c:2938
 msgid "test if socket"
 msgstr ""
 
-#: fish/cmds.c:179 fish/cmds.c:2041
+#: fish/cmds.c:2939
 msgid "test if symbolic link"
 msgstr ""
 
-#: fish/cmds.c:180 fish/cmds.c:461
+#: fish/cmds.c:2940
+msgid "test if a file contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2941
+msgid "test if a device contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2942
 msgid "kill the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:181 fish/cmds.c:456
+#: fish/cmds.c:2943
 msgid "launch the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:182 fish/cmds.c:421
+#: fish/cmds.c:2944
 msgid "change working directory"
 msgstr ""
 
-#: fish/cmds.c:185 fish/cmds.c:726
+#: fish/cmds.c:2948
+msgid "list 9p filesystems"
+msgstr ""
+
+#: fish/cmds.c:2949
 msgid "list the block devices"
 msgstr ""
 
-#: fish/cmds.c:186 fish/cmds.c:691
+#: fish/cmds.c:2950
+msgid "list device mapper devices"
+msgstr ""
+
+#: fish/cmds.c:2951
 msgid "list filesystems"
 msgstr ""
 
-#: fish/cmds.c:187 fish/cmds.c:731
+#: fish/cmds.c:2952
+msgid "list Linux md (RAID) devices"
+msgstr ""
+
+#: fish/cmds.c:2953
 msgid "list the partitions"
 msgstr ""
 
-#: fish/cmds.c:188 fish/cmds.c:716
+#: fish/cmds.c:2954
 msgid "list the files in a directory (long format)"
 msgstr ""
 
-#: fish/cmds.c:189 fish/cmds.c:190 fish/cmds.c:1511 fish/cmds.c:1516
+#: fish/cmds.c:2955 fish/cmds.c:2956
 msgid "create a hard link"
 msgstr ""
 
-#: fish/cmds.c:191 fish/cmds.c:192 fish/cmds.c:1521 fish/cmds.c:1526
+#: fish/cmds.c:2957 fish/cmds.c:2958
 msgid "create a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:193 fish/cmds.c:281 fish/cmds.c:1416 fish/cmds.c:1421
+#: fish/cmds.c:2959 fish/cmds.c:3056
 msgid "remove extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:194 fish/cmds.c:721
+#: fish/cmds.c:2960
 msgid "list the files in a directory"
 msgstr ""
 
-#: fish/cmds.c:195 fish/cmds.c:306 fish/cmds.c:1406 fish/cmds.c:1411
+#: fish/cmds.c:2961 fish/cmds.c:3086
 msgid "set extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:196 fish/cmds.c:956
+#: fish/cmds.c:2962
 msgid "get file information for a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:197 fish/cmds.c:1711
+#: fish/cmds.c:2963
 msgid "lstat on multiple files"
 msgstr ""
 
-#: fish/cmds.c:198 fish/cmds.c:2001
+#: fish/cmds.c:2964
 msgid "add a key on a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:199 fish/cmds.c:1986
+#: fish/cmds.c:2965
 msgid "close a LUKS device"
 msgstr ""
 
-#: fish/cmds.c:200 fish/cmds.c:201 fish/cmds.c:1991 fish/cmds.c:1996
+#: fish/cmds.c:2966 fish/cmds.c:2967
 msgid "format a block device as a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:202 fish/cmds.c:2006
+#: fish/cmds.c:2968
 msgid "remove a key from a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:203 fish/cmds.c:1976
+#: fish/cmds.c:2969
 msgid "open a LUKS-encrypted block device"
 msgstr ""
 
-#: fish/cmds.c:204 fish/cmds.c:1981
+#: fish/cmds.c:2970
 msgid "open a LUKS-encrypted block device read-only"
 msgstr ""
 
-#: fish/cmds.c:205 fish/cmds.c:896
+#: fish/cmds.c:2971
 msgid "create an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:206 fish/cmds.c:1971
+#: fish/cmds.c:2972
+msgid "get canonical name of an LV"
+msgstr ""
+
+#: fish/cmds.c:2973
 msgid "clear LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:207 fish/cmds.c:931
+#: fish/cmds.c:2974
 msgid "remove all LVM LVs, VGs and PVs"
 msgstr ""
 
-#: fish/cmds.c:208 fish/cmds.c:1966
+#: fish/cmds.c:2975
 msgid "set LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:209 fish/cmds.c:1076
+#: fish/cmds.c:2976
 msgid "remove an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:210 fish/cmds.c:1786
+#: fish/cmds.c:2977
 msgid "rename an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:211 fish/cmds.c:1216
+#: fish/cmds.c:2978
 msgid "resize an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:212 fish/cmds.c:1881
+#: fish/cmds.c:2979
 msgid "expand an LV to fill free space"
 msgstr ""
 
-#: fish/cmds.c:213 fish/cmds.c:214 fish/cmds.c:746 fish/cmds.c:761
+#: fish/cmds.c:2980 fish/cmds.c:2981
 msgid "list the LVM logical volumes (LVs)"
 msgstr ""
 
-#: fish/cmds.c:215 fish/cmds.c:1811
+#: fish/cmds.c:2982
 msgid "get the UUID of a logical volume"
 msgstr ""
 
-#: fish/cmds.c:216 fish/cmds.c:1716
+#: fish/cmds.c:2983
 msgid "lgetxattr on multiple files"
 msgstr ""
 
-#: fish/cmds.c:217 fish/cmds.c:426
+#: fish/cmds.c:2984
 msgid "open the manual"
 msgstr ""
 
-#: fish/cmds.c:218 fish/cmds.c:851
+#: fish/cmds.c:2985
+msgid "create a Linux md (RAID) device"
+msgstr ""
+
+#: fish/cmds.c:2986
+msgid "obtain metadata for an MD device"
+msgstr ""
+
+#: fish/cmds.c:2987
+msgid "stop a Linux md (RAID) device"
+msgstr ""
+
+#: fish/cmds.c:2988
 msgid "create a directory"
 msgstr ""
 
-#: fish/cmds.c:219 fish/cmds.c:1701
+#: fish/cmds.c:2989
 msgid "create a directory with a particular mode"
 msgstr ""
 
-#: fish/cmds.c:220 fish/cmds.c:856
+#: fish/cmds.c:2990
 msgid "create a directory and parents"
 msgstr ""
 
-#: fish/cmds.c:221 fish/cmds.c:1276
+#: fish/cmds.c:2991
 msgid "create a temporary directory"
 msgstr ""
 
-#: fish/cmds.c:222 fish/cmds.c:223 fish/cmds.c:224 fish/cmds.c:1646
-#: fish/cmds.c:1651 fish/cmds.c:1656
+#: fish/cmds.c:2992 fish/cmds.c:2993 fish/cmds.c:2994
 msgid "make ext2/3/4 filesystem with external journal"
 msgstr ""
 
-#: fish/cmds.c:225 fish/cmds.c:1631
+#: fish/cmds.c:2995
 msgid "make ext2/3/4 external journal"
 msgstr ""
 
-#: fish/cmds.c:226 fish/cmds.c:1636
+#: fish/cmds.c:2996
 msgid "make ext2/3/4 external journal with label"
 msgstr ""
 
-#: fish/cmds.c:227 fish/cmds.c:1641
+#: fish/cmds.c:2997
 msgid "make ext2/3/4 external journal with UUID"
 msgstr ""
 
-#: fish/cmds.c:228 fish/cmds.c:1361
+#: fish/cmds.c:2998
 msgid "make FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:229 fish/cmds.c:901
+#: fish/cmds.c:2999 fish/cmds.c:3001
 msgid "make a filesystem"
 msgstr ""
 
-#: fish/cmds.c:230 fish/cmds.c:1626
+#: fish/cmds.c:3000
 msgid "make a filesystem with block size"
 msgstr ""
 
-#: fish/cmds.c:231 fish/cmds.c:1431
+#: fish/cmds.c:3002
 msgid "create a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:232 fish/cmds.c:1356
+#: fish/cmds.c:3003
 msgid "make block, character or FIFO devices"
 msgstr ""
 
-#: fish/cmds.c:233 fish/cmds.c:1366
+#: fish/cmds.c:3004
 msgid "make block device node"
 msgstr ""
 
-#: fish/cmds.c:234 fish/cmds.c:1371
+#: fish/cmds.c:3005
 msgid "make char device node"
 msgstr ""
 
-#: fish/cmds.c:235 fish/cmds.c:1341
+#: fish/cmds.c:3006
 msgid "create a swap partition"
 msgstr ""
 
-#: fish/cmds.c:236 fish/cmds.c:1346
+#: fish/cmds.c:3007
 msgid "create a swap partition with a label"
 msgstr ""
 
-#: fish/cmds.c:237 fish/cmds.c:1351
+#: fish/cmds.c:3008
 msgid "create a swap partition with an explicit UUID"
 msgstr ""
 
-#: fish/cmds.c:238 fish/cmds.c:1581
+#: fish/cmds.c:3009
 msgid "create a swap file"
 msgstr ""
 
-#: fish/cmds.c:239 fish/cmds.c:1661
+#: fish/cmds.c:3010
 msgid "load a kernel module"
 msgstr ""
 
-#: fish/cmds.c:240 fish/cmds.c:431
+#: fish/cmds.c:3011
 msgid "view a file"
 msgstr ""
 
-#: fish/cmds.c:241 fish/cmds.c:696
+#: fish/cmds.c:3012
 msgid "mount a guest disk at a position in the filesystem"
 msgstr ""
 
-#: fish/cmds.c:242 fish/cmds.c:1336
+#: fish/cmds.c:3013
+msgid "mount 9p filesystem"
+msgstr ""
+
+#: fish/cmds.c:3014
 msgid "mount a file using the loop device"
 msgstr ""
 
-#: fish/cmds.c:243 fish/cmds.c:1061
+#: fish/cmds.c:3015
 msgid "mount a guest disk with mount options"
 msgstr ""
 
-#: fish/cmds.c:244 fish/cmds.c:1056
+#: fish/cmds.c:3016
 msgid "mount a guest disk, read-only"
 msgstr ""
 
-#: fish/cmds.c:245 fish/cmds.c:1066
+#: fish/cmds.c:3017
 msgid "mount a guest disk with mount options and vfstype"
 msgstr ""
 
-#: fish/cmds.c:246 fish/cmds.c:1426
+#: fish/cmds.c:3018
 msgid "show mountpoints"
 msgstr ""
 
-#: fish/cmds.c:247 fish/cmds.c:921
+#: fish/cmds.c:3019
 msgid "show mounted filesystems"
 msgstr ""
 
-#: fish/cmds.c:248 fish/cmds.c:1136
+#: fish/cmds.c:3020
 msgid "move a file"
 msgstr ""
 
-#: fish/cmds.c:249 fish/cmds.c:1241
+#: fish/cmds.c:3021
 msgid "probe NTFS volume"
 msgstr ""
 
-#: fish/cmds.c:250 fish/cmds.c:1846
+#: fish/cmds.c:3022 fish/cmds.c:3023
 msgid "resize an NTFS filesystem"
 msgstr ""
 
-#: fish/cmds.c:251 fish/cmds.c:1941
+#: fish/cmds.c:3024
 msgid "resize an NTFS filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:252 fish/cmds.c:1736
+#: fish/cmds.c:3025
 msgid "add a partition to the device"
 msgstr ""
 
-#: fish/cmds.c:253 fish/cmds.c:1856
+#: fish/cmds.c:3026
 msgid "delete a partition"
 msgstr ""
 
-#: fish/cmds.c:254 fish/cmds.c:1741
+#: fish/cmds.c:3027
 msgid "partition whole disk with a single primary partition"
 msgstr ""
 
-#: fish/cmds.c:255 fish/cmds.c:1861
+#: fish/cmds.c:3028
 msgid "return true if a partition is bootable"
 msgstr ""
 
-#: fish/cmds.c:256 fish/cmds.c:1866
+#: fish/cmds.c:3029
 msgid "get the MBR type byte (ID byte) from a partition"
 msgstr ""
 
-#: fish/cmds.c:257 fish/cmds.c:1761
+#: fish/cmds.c:3030
 msgid "get the partition table type"
 msgstr ""
 
-#: fish/cmds.c:258 fish/cmds.c:1731
+#: fish/cmds.c:3031
 msgid "create an empty partition table"
 msgstr ""
 
-#: fish/cmds.c:259 fish/cmds.c:1756
+#: fish/cmds.c:3032
 msgid "list partitions on a device"
 msgstr ""
 
-#: fish/cmds.c:260 fish/cmds.c:1746
+#: fish/cmds.c:3033
 msgid "make a partition bootable"
 msgstr ""
 
-#: fish/cmds.c:261 fish/cmds.c:1871
+#: fish/cmds.c:3034
 msgid "set the MBR type byte (ID byte) of a partition"
 msgstr ""
 
-#: fish/cmds.c:262 fish/cmds.c:1751
+#: fish/cmds.c:3035
 msgid "set partition name"
 msgstr ""
 
-#: fish/cmds.c:263 fish/cmds.c:2051
+#: fish/cmds.c:3036
 msgid "convert partition name to device name"
 msgstr ""
 
-#: fish/cmds.c:264 fish/cmds.c:1151
+#: fish/cmds.c:3037
+msgid "convert partition name to partition number"
+msgstr ""
+
+#: fish/cmds.c:3038
 msgid "ping the guest daemon"
 msgstr ""
 
-#: fish/cmds.c:265 fish/cmds.c:1726
+#: fish/cmds.c:3039
 msgid "read part of a file"
 msgstr ""
 
-#: fish/cmds.c:266 fish/cmds.c:886
+#: fish/cmds.c:3040
+msgid "read part of a device"
+msgstr ""
+
+#: fish/cmds.c:3041
 msgid "create an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:267 fish/cmds.c:1086
+#: fish/cmds.c:3042
 msgid "remove an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:268 fish/cmds.c:1181
+#: fish/cmds.c:3043
 msgid "resize an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:269 fish/cmds.c:1936
+#: fish/cmds.c:3044
 msgid "resize an LVM physical volume (with size)"
 msgstr ""
 
-#: fish/cmds.c:270 fish/cmds.c:271 fish/cmds.c:736 fish/cmds.c:751
+#: fish/cmds.c:3045 fish/cmds.c:3046
 msgid "list the LVM physical volumes (PVs)"
 msgstr ""
 
-#: fish/cmds.c:272 fish/cmds.c:1801
+#: fish/cmds.c:3047
 msgid "get the UUID of a physical volume"
 msgstr ""
 
-#: fish/cmds.c:273 fish/cmds.c:1926
+#: fish/cmds.c:3048
 msgid "write to part of a file"
 msgstr ""
 
-#: fish/cmds.c:274 fish/cmds.c:2066
+#: fish/cmds.c:3049
 msgid "write to part of a device"
 msgstr ""
 
-#: fish/cmds.c:275 fish/cmds.c:1441
+#: fish/cmds.c:3050
 msgid "read a file"
 msgstr ""
 
-#: fish/cmds.c:276 fish/cmds.c:766
+#: fish/cmds.c:3051
 msgid "read file as lines"
 msgstr ""
 
-#: fish/cmds.c:277 fish/cmds.c:1381
+#: fish/cmds.c:3052
 msgid "read directories entries"
 msgstr ""
 
-#: fish/cmds.c:278 fish/cmds.c:1531
+#: fish/cmds.c:3053
 msgid "read the target of a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:279 fish/cmds.c:1721
+#: fish/cmds.c:3054
 msgid "readlink on multiple files"
 msgstr ""
 
-#: fish/cmds.c:280 fish/cmds.c:1506
+#: fish/cmds.c:3055
 msgid "canonicalized absolute pathname"
 msgstr ""
 
-#: fish/cmds.c:282 fish/cmds.c:436
+#: fish/cmds.c:3057
 msgid "close and reopen libguestfs handle"
 msgstr ""
 
-#: fish/cmds.c:283 fish/cmds.c:1221
+#: fish/cmds.c:3058
 msgid "resize an ext2, ext3 or ext4 filesystem"
 msgstr ""
 
-#: fish/cmds.c:284 fish/cmds.c:1931
+#: fish/cmds.c:3059
+msgid "resize an ext2, ext3 or ext4 filesystem to the minimum size"
+msgstr ""
+
+#: fish/cmds.c:3060
 msgid "resize an ext2, ext3 or ext4 filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:285 fish/cmds.c:836
+#: fish/cmds.c:3061
 msgid "remove a file"
 msgstr ""
 
-#: fish/cmds.c:286 fish/cmds.c:846
+#: fish/cmds.c:3062
 msgid "remove a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:287 fish/cmds.c:841
+#: fish/cmds.c:3063
 msgid "remove a directory"
 msgstr ""
 
-#: fish/cmds.c:288 fish/cmds.c:1436
+#: fish/cmds.c:3064
 msgid "remove a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:289 fish/cmds.c:1261
+#: fish/cmds.c:3065
 msgid "scrub (securely wipe) a device"
 msgstr ""
 
-#: fish/cmds.c:290 fish/cmds.c:1266
+#: fish/cmds.c:3066
 msgid "scrub (securely wipe) a file"
 msgstr ""
 
-#: fish/cmds.c:291 fish/cmds.c:1271
+#: fish/cmds.c:3067
 msgid "scrub (securely wipe) free space"
 msgstr ""
 
-#: fish/cmds.c:292 fish/cmds.c:506
+#: fish/cmds.c:3068
 msgid "add options to kernel command line"
 msgstr ""
 
-#: fish/cmds.c:293 fish/cmds.c:516
+#: fish/cmds.c:3069
+msgid "set the attach method"
+msgstr ""
+
+#: fish/cmds.c:3070
 msgid "set autosync mode"
 msgstr ""
 
-#: fish/cmds.c:294 fish/cmds.c:601
+#: fish/cmds.c:3071
 msgid "enable or disable direct appliance mode"
 msgstr ""
 
-#: fish/cmds.c:295 fish/cmds.c:1091
+#: fish/cmds.c:3072
 msgid "set the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:296 fish/cmds.c:1101
+#: fish/cmds.c:3073
 msgid "set the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:297 fish/cmds.c:561
+#: fish/cmds.c:3074
 msgid "set memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:298 fish/cmds.c:681
+#: fish/cmds.c:3075
 msgid "set enable network flag"
 msgstr ""
 
-#: fish/cmds.c:299 fish/cmds.c:496
+#: fish/cmds.c:3076
 msgid "set the search path"
 msgstr ""
 
-#: fish/cmds.c:300 fish/cmds.c:486
+#: fish/cmds.c:3077
+msgid "set process group flag"
+msgstr ""
+
+#: fish/cmds.c:3078
 msgid "set the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:301 fish/cmds.c:611
+#: fish/cmds.c:3079
 msgid "enable or disable the recovery process"
 msgstr ""
 
-#: fish/cmds.c:302 fish/cmds.c:581
+#: fish/cmds.c:3080
 msgid "set SELinux enabled or disabled at appliance boot"
 msgstr ""
 
-#: fish/cmds.c:303 fish/cmds.c:591
+#: fish/cmds.c:3081
+msgid "set number of virtual CPUs in appliance"
+msgstr ""
+
+#: fish/cmds.c:3082
 msgid "enable or disable command traces"
 msgstr ""
 
-#: fish/cmds.c:304 fish/cmds.c:526
+#: fish/cmds.c:3083
 msgid "set verbose mode"
 msgstr ""
 
-#: fish/cmds.c:305 fish/cmds.c:1616
+#: fish/cmds.c:3084
 msgid "set SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:307 fish/cmds.c:308 fish/cmds.c:906 fish/cmds.c:1386
+#: fish/cmds.c:3085
+msgid "set an environment variable"
+msgstr ""
+
+#: fish/cmds.c:3087 fish/cmds.c:3088
 msgid "create partitions on a block device"
 msgstr ""
 
-#: fish/cmds.c:309 fish/cmds.c:1186
+#: fish/cmds.c:3089
 msgid "modify a single partition on a block device"
 msgstr ""
 
-#: fish/cmds.c:310 fish/cmds.c:1201
+#: fish/cmds.c:3090
 msgid "display the disk geometry from the partition table"
 msgstr ""
 
-#: fish/cmds.c:311 fish/cmds.c:1196
+#: fish/cmds.c:3091
 msgid "display the kernel geometry"
 msgstr ""
 
-#: fish/cmds.c:312 fish/cmds.c:1191
+#: fish/cmds.c:3092
 msgid "display the partition table"
 msgstr ""
 
-#: fish/cmds.c:313 fish/cmds.c:1246
+#: fish/cmds.c:3093
 msgid "run a command via the shell"
 msgstr ""
 
-#: fish/cmds.c:314 fish/cmds.c:1251
+#: fish/cmds.c:3094
 msgid "run a command via the shell returning lines"
 msgstr ""
 
-#: fish/cmds.c:315 fish/cmds.c:1236
+#: fish/cmds.c:3095
 msgid "sleep for some seconds"
 msgstr ""
 
-#: fish/cmds.c:316 fish/cmds.c:441
+#: fish/cmds.c:3096
 msgid "create a sparse disk image and add"
 msgstr ""
 
-#: fish/cmds.c:317 fish/cmds.c:951
+#: fish/cmds.c:3097
 msgid "get file information"
 msgstr ""
 
-#: fish/cmds.c:318 fish/cmds.c:961
+#: fish/cmds.c:3098
 msgid "get file system statistics"
 msgstr ""
 
-#: fish/cmds.c:319 fish/cmds.c:320 fish/cmds.c:1161 fish/cmds.c:1166
+#: fish/cmds.c:3099 fish/cmds.c:3100
 msgid "print the printable strings in a file"
 msgstr ""
 
-#: fish/cmds.c:321 fish/cmds.c:446
+#: fish/cmds.c:3101
 msgid "list supported groups of commands"
 msgstr ""
 
-#: fish/cmds.c:322 fish/cmds.c:1546
+#: fish/cmds.c:3102
 msgid "disable swap on device"
 msgstr ""
 
-#: fish/cmds.c:323 fish/cmds.c:1556
+#: fish/cmds.c:3103
 msgid "disable swap on file"
 msgstr ""
 
-#: fish/cmds.c:324 fish/cmds.c:1566
+#: fish/cmds.c:3104
 msgid "disable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:325 fish/cmds.c:1576
+#: fish/cmds.c:3105
 msgid "disable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:326 fish/cmds.c:1541
+#: fish/cmds.c:3106
 msgid "enable swap on device"
 msgstr ""
 
-#: fish/cmds.c:327 fish/cmds.c:1551
+#: fish/cmds.c:3107
 msgid "enable swap on file"
 msgstr ""
 
-#: fish/cmds.c:328 fish/cmds.c:1561
+#: fish/cmds.c:3108
 msgid "enable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:329 fish/cmds.c:1571
+#: fish/cmds.c:3109
 msgid "enable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:330 fish/cmds.c:701
+#: fish/cmds.c:3110
 msgid "sync disks, writes are flushed through to the disk image"
 msgstr ""
 
-#: fish/cmds.c:331 fish/cmds.c:1306
+#: fish/cmds.c:3111
 msgid "return last 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:332 fish/cmds.c:1311
+#: fish/cmds.c:3112
 msgid "return last N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:333 fish/cmds.c:1036
+#: fish/cmds.c:3113
 msgid "unpack tarfile to directory"
 msgstr ""
 
-#: fish/cmds.c:334 fish/cmds.c:1041
+#: fish/cmds.c:3114
 msgid "pack directory into tarfile"
 msgstr ""
 
-#: fish/cmds.c:335 fish/cmds.c:342 fish/cmds.c:1046 fish/cmds.c:1836
+#: fish/cmds.c:3115 fish/cmds.c:3123
 msgid "unpack compressed tarball to directory"
 msgstr ""
 
-#: fish/cmds.c:336 fish/cmds.c:343 fish/cmds.c:1051 fish/cmds.c:1841
+#: fish/cmds.c:3116 fish/cmds.c:3124
 msgid "pack directory into compressed tarball"
 msgstr ""
 
-#: fish/cmds.c:337 fish/cmds.c:451
+#: fish/cmds.c:3117
 msgid "print elapsed time taken to run a command"
 msgstr ""
 
-#: fish/cmds.c:338 fish/cmds.c:706
+#: fish/cmds.c:3118
 msgid "update file timestamps or create a new file"
 msgstr ""
 
-#: fish/cmds.c:339 fish/cmds.c:1686
+#: fish/cmds.c:3119
 msgid "truncate a file to zero size"
 msgstr ""
 
-#: fish/cmds.c:340 fish/cmds.c:1691
+#: fish/cmds.c:3120
 msgid "truncate a file to a particular size"
 msgstr ""
 
-#: fish/cmds.c:341 fish/cmds.c:966
+#: fish/cmds.c:3121
+msgid "adjust ext2/ext3/ext4 filesystem parameters"
+msgstr ""
+
+#: fish/cmds.c:3122
 msgid "get ext2/ext3/ext4 superblock details"
 msgstr ""
 
-#: fish/cmds.c:344 fish/cmds.c:1376
+#: fish/cmds.c:3125
 msgid "set file mode creation mask (umask)"
 msgstr ""
 
-#: fish/cmds.c:345 fish/cmds.c:916
+#: fish/cmds.c:3126
 msgid "unmount a filesystem"
 msgstr ""
 
-#: fish/cmds.c:346 fish/cmds.c:926
+#: fish/cmds.c:3127
 msgid "unmount all filesystems"
 msgstr ""
 
-#: fish/cmds.c:347 fish/cmds.c:1021
+#: fish/cmds.c:3128
+msgid "unset an environment variable"
+msgstr ""
+
+#: fish/cmds.c:3129
 msgid "upload a file from the local machine"
 msgstr ""
 
-#: fish/cmds.c:348 fish/cmds.c:2056
+#: fish/cmds.c:3130
 msgid "upload a file from the local machine with offset"
 msgstr ""
 
-#: fish/cmds.c:349 fish/cmds.c:1696
+#: fish/cmds.c:3131
 msgid "set timestamp of a file with nanosecond precision"
 msgstr ""
 
-#: fish/cmds.c:350 fish/cmds.c:576
+#: fish/cmds.c:3132
 msgid "get the library version number"
 msgstr ""
 
-#: fish/cmds.c:351 fish/cmds.c:1956
+#: fish/cmds.c:3133
 msgid "get the filesystem label"
 msgstr ""
 
-#: fish/cmds.c:352 fish/cmds.c:1681
+#: fish/cmds.c:3134
 msgid "get the Linux VFS type corresponding to a mounted device"
 msgstr ""
 
-#: fish/cmds.c:353 fish/cmds.c:1961
+#: fish/cmds.c:3135
 msgid "get the filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:354 fish/cmds.c:1211
+#: fish/cmds.c:3136
 msgid "activate or deactivate some volume groups"
 msgstr ""
 
-#: fish/cmds.c:355 fish/cmds.c:1206
+#: fish/cmds.c:3137
 msgid "activate or deactivate all volume groups"
 msgstr ""
 
-#: fish/cmds.c:356 fish/cmds.c:891
+#: fish/cmds.c:3138
 msgid "create an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:357 fish/cmds.c:1821
+#: fish/cmds.c:3139
 msgid "get the LV UUIDs of all LVs in the volume group"
 msgstr ""
 
-#: fish/cmds.c:358 fish/cmds.c:1816
+#: fish/cmds.c:3140
 msgid "get the PV UUIDs containing the volume group"
 msgstr ""
 
-#: fish/cmds.c:359 fish/cmds.c:1081
+#: fish/cmds.c:3141
 msgid "remove an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:360 fish/cmds.c:1791
+#: fish/cmds.c:3142
 msgid "rename an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:361 fish/cmds.c:362 fish/cmds.c:741 fish/cmds.c:756
+#: fish/cmds.c:3143 fish/cmds.c:3144
 msgid "list the LVM volume groups (VGs)"
 msgstr ""
 
-#: fish/cmds.c:363 fish/cmds.c:1851
+#: fish/cmds.c:3145
 msgid "rescan for LVM physical volumes, volume groups and logical volumes"
 msgstr ""
 
-#: fish/cmds.c:364 fish/cmds.c:1806
+#: fish/cmds.c:3146
 msgid "get the UUID of a volume group"
 msgstr ""
 
-#: fish/cmds.c:365 fish/cmds.c:1291
+#: fish/cmds.c:3147
 msgid "count characters in a file"
 msgstr ""
 
-#: fish/cmds.c:366 fish/cmds.c:1281
+#: fish/cmds.c:3148
 msgid "count lines in a file"
 msgstr ""
 
-#: fish/cmds.c:367 fish/cmds.c:1286
+#: fish/cmds.c:3149
 msgid "count words in a file"
 msgstr ""
 
-#: fish/cmds.c:368 fish/cmds.c:1921
+#: fish/cmds.c:3150
 msgid "create a new file"
 msgstr ""
 
-#: fish/cmds.c:369 fish/cmds.c:911
+#: fish/cmds.c:3151
+msgid "append content to end of file"
+msgstr ""
+
+#: fish/cmds.c:3152
 msgid "create a file"
 msgstr ""
 
-#: fish/cmds.c:372 fish/cmds.c:1116
+#: fish/cmds.c:3155
 msgid "write zeroes to the device"
 msgstr ""
 
-#: fish/cmds.c:373 fish/cmds.c:1831
+#: fish/cmds.c:3156
 msgid "write zeroes to an entire device"
 msgstr ""
 
-#: fish/cmds.c:374 fish/cmds.c:1176
+#: fish/cmds.c:3157
 msgid "zero unused inodes and disk blocks on ext2/3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:377 fish/cmds.c:1391
+#: fish/cmds.c:3160
 msgid "determine file type inside a compressed file"
 msgstr ""
 
-#: fish/cmds.c:380
+#: fish/cmds.c:3163
 msgid "Use -h <cmd> / help <cmd> to show detailed help for a command."
 msgstr ""
 
-#: fish/cmds.c:2346 fish/cmds.c:2358 fish/cmds.c:2371 fish/cmds.c:2386
-#: fish/cmds.c:2401 fish/cmds.c:2417 fish/cmds.c:2434 fish/cmds.c:2449
-#: fish/cmds.c:2464 fish/cmds.c:2479 fish/cmds.c:2494 fish/cmds.c:2509
-#: fish/cmds.c:2523 fish/cmds.c:2537 fish/cmds.c:2552 fish/cmds.c:2566
-#: fish/cmds.c:2580 fish/cmds.c:2594 fish/cmds.c:2608 fish/cmds.c:2622
-#: fish/cmds.c:2636 fish/cmds.c:2651 fish/cmds.c:2683 fish/cmds.c:2697
-#: fish/cmds.c:2711 fish/cmds.c:2727 fish/cmds.c:2741 fish/cmds.c:2756
-#: fish/cmds.c:2770 fish/cmds.c:2785 fish/cmds.c:2799 fish/cmds.c:2814
-#: fish/cmds.c:2828 fish/cmds.c:2844 fish/cmds.c:2861 fish/cmds.c:2877
-#: fish/cmds.c:2896 fish/cmds.c:2912 fish/cmds.c:2930 fish/cmds.c:2948
-#: fish/cmds.c:2966 fish/cmds.c:2983 fish/cmds.c:3000 fish/cmds.c:3018
-#: fish/cmds.c:3036 fish/cmds.c:3054 fish/cmds.c:3068 fish/cmds.c:3082
-#: fish/cmds.c:3099 fish/cmds.c:3114 fish/cmds.c:3127 fish/cmds.c:3144
-#: fish/cmds.c:3164 fish/cmds.c:3184 fish/cmds.c:3203 fish/cmds.c:3218
-#: fish/cmds.c:3233 fish/cmds.c:3248 fish/cmds.c:3263 fish/cmds.c:3278
-#: fish/cmds.c:3293 fish/cmds.c:3308 fish/cmds.c:3324 fish/cmds.c:3345
-#: fish/cmds.c:3380 fish/cmds.c:3394 fish/cmds.c:3415 fish/cmds.c:3435
-#: fish/cmds.c:3454 fish/cmds.c:3472 fish/cmds.c:3489 fish/cmds.c:3507
-#: fish/cmds.c:3523 fish/cmds.c:3540 fish/cmds.c:3552 fish/cmds.c:3565
-#: fish/cmds.c:3583 fish/cmds.c:3600 fish/cmds.c:3617 fish/cmds.c:3634
-#: fish/cmds.c:3651 fish/cmds.c:3669 fish/cmds.c:3707 fish/cmds.c:3762
-#: fish/cmds.c:3781 fish/cmds.c:3800 fish/cmds.c:3819 fish/cmds.c:3835
-#: fish/cmds.c:3855 fish/cmds.c:3891 fish/cmds.c:3911 fish/cmds.c:3988
-#: fish/cmds.c:4025 fish/cmds.c:4039 fish/cmds.c:4054 fish/cmds.c:4066
-#: fish/cmds.c:4079 fish/cmds.c:4099 fish/cmds.c:4119 fish/cmds.c:4139
-#: fish/cmds.c:4159 fish/cmds.c:4179 fish/cmds.c:4199 fish/cmds.c:4217
-#: fish/cmds.c:4232 fish/cmds.c:4247 fish/cmds.c:4264 fish/cmds.c:4281
-#: fish/cmds.c:4299 fish/cmds.c:4333 fish/cmds.c:4350 fish/cmds.c:4367
-#: fish/cmds.c:4382 fish/cmds.c:4398 fish/cmds.c:4419 fish/cmds.c:4440
-#: fish/cmds.c:4462 fish/cmds.c:4483 fish/cmds.c:4502 fish/cmds.c:4523
-#: fish/cmds.c:4544 fish/cmds.c:4562 fish/cmds.c:4582 fish/cmds.c:4601
-#: fish/cmds.c:4622 fish/cmds.c:4637 fish/cmds.c:4652 fish/cmds.c:4668
-#: fish/cmds.c:4684 fish/cmds.c:4703 fish/cmds.c:4719 fish/cmds.c:4738
-#: fish/cmds.c:4756 fish/cmds.c:4772 fish/cmds.c:4791 fish/cmds.c:4812
-#: fish/cmds.c:4833 fish/cmds.c:4853 fish/cmds.c:4885 fish/cmds.c:4900
-#: fish/cmds.c:4914 fish/cmds.c:4936 fish/cmds.c:4957 fish/cmds.c:4978
-#: fish/cmds.c:4998 fish/cmds.c:5013 fish/cmds.c:5033 fish/cmds.c:5125
-#: fish/cmds.c:5143 fish/cmds.c:5161 fish/cmds.c:5179 fish/cmds.c:5195
-#: fish/cmds.c:5214 fish/cmds.c:5248 fish/cmds.c:5263 fish/cmds.c:5283
-#: fish/cmds.c:5298 fish/cmds.c:5332 fish/cmds.c:5350 fish/cmds.c:5368
-#: fish/cmds.c:5386 fish/cmds.c:5406 fish/cmds.c:5421 fish/cmds.c:5438
-#: fish/cmds.c:5455 fish/cmds.c:5475 fish/cmds.c:5494 fish/cmds.c:5513
-#: fish/cmds.c:5532 fish/cmds.c:5553 fish/cmds.c:5592 fish/cmds.c:5613
-#: fish/cmds.c:5651 fish/cmds.c:5666 fish/cmds.c:5682 fish/cmds.c:5701
-#: fish/cmds.c:5722 fish/cmds.c:5742 fish/cmds.c:5758 fish/cmds.c:5775
-#: fish/cmds.c:5794 fish/cmds.c:5869 fish/cmds.c:5908 fish/cmds.c:5985
-#: fish/cmds.c:6059 fish/cmds.c:6094 fish/cmds.c:6115 fish/cmds.c:6134
-#: fish/cmds.c:6155 fish/cmds.c:6175 fish/cmds.c:6198 fish/cmds.c:6239
-#: fish/cmds.c:6278 fish/cmds.c:6297 fish/cmds.c:6314 fish/cmds.c:6330
-#: fish/cmds.c:6345 fish/cmds.c:6361 fish/cmds.c:6386 fish/cmds.c:6408
-#: fish/cmds.c:6430 fish/cmds.c:6452 fish/cmds.c:6474 fish/cmds.c:6496
-#: fish/cmds.c:6518 fish/cmds.c:6540 fish/cmds.c:6562 fish/cmds.c:6584
-#: fish/cmds.c:6606 fish/cmds.c:6628 fish/cmds.c:6649 fish/cmds.c:6670
-#: fish/cmds.c:6689 fish/cmds.c:6708 fish/cmds.c:6727 fish/cmds.c:6745
-#: fish/cmds.c:6766 fish/cmds.c:6802 fish/cmds.c:6817 fish/cmds.c:6832
-#: fish/cmds.c:6849 fish/cmds.c:6866 fish/cmds.c:6881 fish/cmds.c:6896
-#: fish/cmds.c:6911 fish/cmds.c:6926 fish/cmds.c:6943 fish/cmds.c:6977
-#: fish/cmds.c:7015 fish/cmds.c:7047 fish/cmds.c:7062 fish/cmds.c:7077
-#: fish/cmds.c:7090 fish/cmds.c:7104 fish/cmds.c:7122 fish/cmds.c:7158
-#: fish/cmds.c:7194 fish/cmds.c:7231 fish/cmds.c:7269 fish/cmds.c:7308
-#: fish/cmds.c:7347 fish/cmds.c:7383 fish/cmds.c:7398 fish/cmds.c:7419
-#: fish/cmds.c:7439 fish/cmds.c:7459 fish/cmds.c:7477 fish/cmds.c:7495
-#: fish/cmds.c:7529 fish/cmds.c:7599 fish/cmds.c:7637 fish/cmds.c:7693
-#: fish/cmds.c:7717 fish/cmds.c:7741 fish/cmds.c:7767 fish/cmds.c:7824
-#: fish/cmds.c:7843 fish/cmds.c:7886 fish/cmds.c:7904 fish/cmds.c:7941
-#: fish/cmds.c:7976 fish/cmds.c:7994 fish/cmds.c:8014 fish/cmds.c:8069
-#: fish/cmds.c:8087 fish/cmds.c:8107 fish/cmds.c:8127 fish/cmds.c:8144
-#: fish/cmds.c:8162 fish/cmds.c:8187 fish/cmds.c:8205 fish/cmds.c:8223
-#: fish/cmds.c:8241 fish/cmds.c:8259 fish/cmds.c:8279 fish/cmds.c:8312
-#: fish/cmds.c:8328 fish/cmds.c:8349 fish/cmds.c:8369 fish/cmds.c:8383
-#: fish/cmds.c:8397 fish/cmds.c:8432 fish/cmds.c:8469 fish/cmds.c:8507
-#: fish/cmds.c:8561 fish/cmds.c:8581 fish/cmds.c:8615 fish/cmds.c:8629
-#: fish/cmds.c:8646 fish/cmds.c:8684 fish/cmds.c:8705 fish/cmds.c:8727
-#: fish/cmds.c:8750 fish/cmds.c:8789 fish/cmds.c:8812 fish/cmds.c:8848
-#: fish/cmds.c:8877 fish/cmds.c:8906 fish/cmds.c:8933 fish/cmds.c:8950
-#: fish/cmds.c:8980 fish/cmds.c:8998 fish/cmds.c:9016 fish/cmds.c:9032
-#: fish/cmds.c:9047 fish/cmds.c:9068 fish/cmds.c:9087 fish/cmds.c:9104
-#: fish/cmds.c:9144 fish/cmds.c:9185 fish/cmds.c:9227 fish/cmds.c:9264
-#: fish/cmds.c:9281 fish/cmds.c:9299 fish/cmds.c:9317 fish/cmds.c:9336
-#: fish/cmds.c:9355 fish/cmds.c:9374 fish/cmds.c:9393 fish/cmds.c:9412
-#: fish/cmds.c:9432 fish/cmds.c:9468 fish/cmds.c:9517
+#: fish/cmds.c:3511 fish/cmds.c:3525 fish/cmds.c:3541 fish/cmds.c:3558
+#: fish/cmds.c:3575 fish/cmds.c:3593 fish/cmds.c:3612 fish/cmds.c:3628
+#: fish/cmds.c:3646 fish/cmds.c:3662 fish/cmds.c:3680 fish/cmds.c:3696
+#: fish/cmds.c:3713 fish/cmds.c:3728 fish/cmds.c:3746 fish/cmds.c:3761
+#: fish/cmds.c:3777 fish/cmds.c:3793 fish/cmds.c:3809 fish/cmds.c:3825
+#: fish/cmds.c:3841 fish/cmds.c:3859 fish/cmds.c:3892 fish/cmds.c:3908
+#: fish/cmds.c:3924 fish/cmds.c:3943 fish/cmds.c:3958 fish/cmds.c:3976
+#: fish/cmds.c:3991 fish/cmds.c:4009 fish/cmds.c:4024 fish/cmds.c:4042
+#: fish/cmds.c:4057 fish/cmds.c:4076 fish/cmds.c:4095 fish/cmds.c:4113
+#: fish/cmds.c:4133 fish/cmds.c:4152 fish/cmds.c:4172 fish/cmds.c:4192
+#: fish/cmds.c:4212 fish/cmds.c:4231 fish/cmds.c:4250 fish/cmds.c:4270
+#: fish/cmds.c:4290 fish/cmds.c:4310 fish/cmds.c:4325 fish/cmds.c:4341
+#: fish/cmds.c:4418 fish/cmds.c:4436 fish/cmds.c:4453 fish/cmds.c:4470
+#: fish/cmds.c:4559 fish/cmds.c:4579 fish/cmds.c:4599 fish/cmds.c:4619
+#: fish/cmds.c:4639 fish/cmds.c:4659 fish/cmds.c:4678 fish/cmds.c:4697
+#: fish/cmds.c:4716 fish/cmds.c:4731 fish/cmds.c:4750 fish/cmds.c:4770
+#: fish/cmds.c:4790 fish/cmds.c:4866 fish/cmds.c:4881 fish/cmds.c:4899
+#: fish/cmds.c:4932 fish/cmds.c:4951 fish/cmds.c:4967 fish/cmds.c:4983
+#: fish/cmds.c:5002 fish/cmds.c:5024 fish/cmds.c:5046 fish/cmds.c:5066
+#: fish/cmds.c:5083 fish/cmds.c:5100 fish/cmds.c:5117 fish/cmds.c:5134
+#: fish/cmds.c:5151 fish/cmds.c:5168 fish/cmds.c:5185 fish/cmds.c:5204
+#: fish/cmds.c:5227 fish/cmds.c:5263 fish/cmds.c:5280 fish/cmds.c:5303
+#: fish/cmds.c:5325 fish/cmds.c:5346 fish/cmds.c:5366 fish/cmds.c:5385
+#: fish/cmds.c:5405 fish/cmds.c:5423 fish/cmds.c:5441 fish/cmds.c:5455
+#: fish/cmds.c:5471 fish/cmds.c:5491 fish/cmds.c:5510 fish/cmds.c:5529
+#: fish/cmds.c:5548 fish/cmds.c:5567 fish/cmds.c:5587 fish/cmds.c:5627
+#: fish/cmds.c:5684 fish/cmds.c:5705 fish/cmds.c:5726 fish/cmds.c:5747
+#: fish/cmds.c:5765 fish/cmds.c:5787 fish/cmds.c:5825 fish/cmds.c:5847
+#: fish/cmds.c:5926 fish/cmds.c:5965 fish/cmds.c:5980 fish/cmds.c:5997
+#: fish/cmds.c:6011 fish/cmds.c:6027 fish/cmds.c:6049 fish/cmds.c:6071
+#: fish/cmds.c:6093 fish/cmds.c:6115 fish/cmds.c:6137 fish/cmds.c:6159
+#: fish/cmds.c:6179 fish/cmds.c:6196 fish/cmds.c:6213 fish/cmds.c:6232
+#: fish/cmds.c:6251 fish/cmds.c:6271 fish/cmds.c:6307 fish/cmds.c:6326
+#: fish/cmds.c:6345 fish/cmds.c:6362 fish/cmds.c:6380 fish/cmds.c:6403
+#: fish/cmds.c:6426 fish/cmds.c:6450 fish/cmds.c:6473 fish/cmds.c:6494
+#: fish/cmds.c:6517 fish/cmds.c:6540 fish/cmds.c:6560 fish/cmds.c:6582
+#: fish/cmds.c:6603 fish/cmds.c:6626 fish/cmds.c:6643 fish/cmds.c:6660
+#: fish/cmds.c:6678 fish/cmds.c:6696 fish/cmds.c:6717 fish/cmds.c:6735
+#: fish/cmds.c:6756 fish/cmds.c:6776 fish/cmds.c:6794 fish/cmds.c:6815
+#: fish/cmds.c:6838 fish/cmds.c:6861 fish/cmds.c:6883 fish/cmds.c:6916
+#: fish/cmds.c:6933 fish/cmds.c:6950 fish/cmds.c:6974 fish/cmds.c:6997
+#: fish/cmds.c:7020 fish/cmds.c:7042 fish/cmds.c:7059 fish/cmds.c:7081
+#: fish/cmds.c:7175 fish/cmds.c:7195 fish/cmds.c:7215 fish/cmds.c:7235
+#: fish/cmds.c:7253 fish/cmds.c:7274 fish/cmds.c:7310 fish/cmds.c:7327
+#: fish/cmds.c:7349 fish/cmds.c:7366 fish/cmds.c:7402 fish/cmds.c:7422
+#: fish/cmds.c:7442 fish/cmds.c:7462 fish/cmds.c:7484 fish/cmds.c:7501
+#: fish/cmds.c:7520 fish/cmds.c:7539 fish/cmds.c:7561 fish/cmds.c:7582
+#: fish/cmds.c:7603 fish/cmds.c:7624 fish/cmds.c:7647 fish/cmds.c:7688
+#: fish/cmds.c:7711 fish/cmds.c:7750 fish/cmds.c:7767 fish/cmds.c:7786
+#: fish/cmds.c:7807 fish/cmds.c:7830 fish/cmds.c:7852 fish/cmds.c:7870
+#: fish/cmds.c:7889 fish/cmds.c:7910 fish/cmds.c:7987 fish/cmds.c:8028
+#: fish/cmds.c:8107 fish/cmds.c:8183 fish/cmds.c:8220 fish/cmds.c:8243
+#: fish/cmds.c:8264 fish/cmds.c:8287 fish/cmds.c:8309 fish/cmds.c:8334
+#: fish/cmds.c:8377 fish/cmds.c:8418 fish/cmds.c:8439 fish/cmds.c:8457
+#: fish/cmds.c:8476 fish/cmds.c:8493 fish/cmds.c:8511 fish/cmds.c:8538
+#: fish/cmds.c:8562 fish/cmds.c:8586 fish/cmds.c:8610 fish/cmds.c:8634
+#: fish/cmds.c:8658 fish/cmds.c:8682 fish/cmds.c:8706 fish/cmds.c:8730
+#: fish/cmds.c:8754 fish/cmds.c:8778 fish/cmds.c:8802 fish/cmds.c:8825
+#: fish/cmds.c:8848 fish/cmds.c:8869 fish/cmds.c:8890 fish/cmds.c:8911
+#: fish/cmds.c:8931 fish/cmds.c:8954 fish/cmds.c:8992 fish/cmds.c:9009
+#: fish/cmds.c:9026 fish/cmds.c:9045 fish/cmds.c:9064 fish/cmds.c:9081
+#: fish/cmds.c:9098 fish/cmds.c:9115 fish/cmds.c:9132 fish/cmds.c:9151
+#: fish/cmds.c:9187 fish/cmds.c:9227 fish/cmds.c:9260 fish/cmds.c:9277
+#: fish/cmds.c:9294 fish/cmds.c:9310 fish/cmds.c:9325 fish/cmds.c:9346
+#: fish/cmds.c:9384 fish/cmds.c:9422 fish/cmds.c:9461 fish/cmds.c:9501
+#: fish/cmds.c:9542 fish/cmds.c:9583 fish/cmds.c:9621 fish/cmds.c:9638
+#: fish/cmds.c:9661 fish/cmds.c:9683 fish/cmds.c:9705 fish/cmds.c:9725
+#: fish/cmds.c:9745 fish/cmds.c:9781 fish/cmds.c:9853 fish/cmds.c:9893
+#: fish/cmds.c:9951 fish/cmds.c:9977 fish/cmds.c:10003 fish/cmds.c:10031
+#: fish/cmds.c:10090 fish/cmds.c:10111 fish/cmds.c:10156 fish/cmds.c:10176
+#: fish/cmds.c:10215 fish/cmds.c:10252 fish/cmds.c:10272 fish/cmds.c:10294
+#: fish/cmds.c:10351 fish/cmds.c:10371 fish/cmds.c:10393 fish/cmds.c:10415
+#: fish/cmds.c:10434 fish/cmds.c:10454 fish/cmds.c:10481 fish/cmds.c:10501
+#: fish/cmds.c:10521 fish/cmds.c:10541 fish/cmds.c:10561 fish/cmds.c:10583
+#: fish/cmds.c:10618 fish/cmds.c:10636 fish/cmds.c:10659 fish/cmds.c:10681
+#: fish/cmds.c:10696 fish/cmds.c:10713 fish/cmds.c:10750 fish/cmds.c:10789
+#: fish/cmds.c:10829 fish/cmds.c:10885 fish/cmds.c:10907 fish/cmds.c:10943
+#: fish/cmds.c:10958 fish/cmds.c:10978 fish/cmds.c:11018 fish/cmds.c:11041
+#: fish/cmds.c:11065 fish/cmds.c:11090 fish/cmds.c:11131 fish/cmds.c:11156
+#: fish/cmds.c:11194 fish/cmds.c:11225 fish/cmds.c:11256 fish/cmds.c:11284
+#: fish/cmds.c:11304 fish/cmds.c:11336 fish/cmds.c:11356 fish/cmds.c:11376
+#: fish/cmds.c:11393 fish/cmds.c:11411 fish/cmds.c:11436 fish/cmds.c:11459
+#: fish/cmds.c:11478 fish/cmds.c:11522 fish/cmds.c:11567 fish/cmds.c:11615
+#: fish/cmds.c:11656 fish/cmds.c:11675 fish/cmds.c:11695 fish/cmds.c:11715
+#: fish/cmds.c:11736 fish/cmds.c:11757 fish/cmds.c:11778 fish/cmds.c:11799
+#: fish/cmds.c:11820 fish/cmds.c:11842 fish/cmds.c:11880 fish/cmds.c:11931
+#: fish/cmds.c:11969 fish/cmds.c:12025 fish/cmds.c:12161 fish/cmds.c:12190
+#: fish/cmds.c:12217 fish/cmds.c:12234 fish/cmds.c:12255 fish/cmds.c:12272
+#: fish/cmds.c:12334 fish/cmds.c:12472 fish/cmds.c:12630 fish/cmds.c:13342
+#: fish/cmds.c:13361 fish/cmds.c:13381 fish/cmds.c:13398
 #, c-format
 msgid "%s should have %d parameter(s)\n"
 msgstr ""
 
-#: fish/cmds.c:2347 fish/cmds.c:2359 fish/cmds.c:2372 fish/cmds.c:2387
-#: fish/cmds.c:2402 fish/cmds.c:2418 fish/cmds.c:2435 fish/cmds.c:2450
-#: fish/cmds.c:2465 fish/cmds.c:2480 fish/cmds.c:2495 fish/cmds.c:2510
-#: fish/cmds.c:2524 fish/cmds.c:2538 fish/cmds.c:2553 fish/cmds.c:2567
-#: fish/cmds.c:2581 fish/cmds.c:2595 fish/cmds.c:2609 fish/cmds.c:2623
-#: fish/cmds.c:2637 fish/cmds.c:2652 fish/cmds.c:2684 fish/cmds.c:2698
-#: fish/cmds.c:2712 fish/cmds.c:2728 fish/cmds.c:2742 fish/cmds.c:2757
-#: fish/cmds.c:2771 fish/cmds.c:2786 fish/cmds.c:2800 fish/cmds.c:2815
-#: fish/cmds.c:2829 fish/cmds.c:2845 fish/cmds.c:2862 fish/cmds.c:2878
-#: fish/cmds.c:2897 fish/cmds.c:2913 fish/cmds.c:2931 fish/cmds.c:2949
-#: fish/cmds.c:2967 fish/cmds.c:2984 fish/cmds.c:3001 fish/cmds.c:3019
-#: fish/cmds.c:3037 fish/cmds.c:3055 fish/cmds.c:3069 fish/cmds.c:3083
-#: fish/cmds.c:3100 fish/cmds.c:3115 fish/cmds.c:3128 fish/cmds.c:3145
-#: fish/cmds.c:3165 fish/cmds.c:3185 fish/cmds.c:3204 fish/cmds.c:3219
-#: fish/cmds.c:3234 fish/cmds.c:3249 fish/cmds.c:3264 fish/cmds.c:3279
-#: fish/cmds.c:3294 fish/cmds.c:3309 fish/cmds.c:3325 fish/cmds.c:3346
-#: fish/cmds.c:3381 fish/cmds.c:3395 fish/cmds.c:3416 fish/cmds.c:3436
-#: fish/cmds.c:3455 fish/cmds.c:3473 fish/cmds.c:3490 fish/cmds.c:3508
-#: fish/cmds.c:3524 fish/cmds.c:3541 fish/cmds.c:3553 fish/cmds.c:3566
-#: fish/cmds.c:3584 fish/cmds.c:3601 fish/cmds.c:3618 fish/cmds.c:3635
-#: fish/cmds.c:3652 fish/cmds.c:3670 fish/cmds.c:3708 fish/cmds.c:3763
-#: fish/cmds.c:3782 fish/cmds.c:3801 fish/cmds.c:3820 fish/cmds.c:3836
-#: fish/cmds.c:3856 fish/cmds.c:3892 fish/cmds.c:3912 fish/cmds.c:3989
-#: fish/cmds.c:4026 fish/cmds.c:4040 fish/cmds.c:4055 fish/cmds.c:4067
-#: fish/cmds.c:4080 fish/cmds.c:4100 fish/cmds.c:4120 fish/cmds.c:4140
-#: fish/cmds.c:4160 fish/cmds.c:4180 fish/cmds.c:4200 fish/cmds.c:4218
-#: fish/cmds.c:4233 fish/cmds.c:4248 fish/cmds.c:4265 fish/cmds.c:4282
-#: fish/cmds.c:4300 fish/cmds.c:4334 fish/cmds.c:4351 fish/cmds.c:4368
-#: fish/cmds.c:4383 fish/cmds.c:4399 fish/cmds.c:4420 fish/cmds.c:4441
-#: fish/cmds.c:4463 fish/cmds.c:4484 fish/cmds.c:4503 fish/cmds.c:4524
-#: fish/cmds.c:4545 fish/cmds.c:4563 fish/cmds.c:4583 fish/cmds.c:4602
-#: fish/cmds.c:4623 fish/cmds.c:4638 fish/cmds.c:4653 fish/cmds.c:4669
-#: fish/cmds.c:4685 fish/cmds.c:4704 fish/cmds.c:4720 fish/cmds.c:4739
-#: fish/cmds.c:4757 fish/cmds.c:4773 fish/cmds.c:4792 fish/cmds.c:4813
-#: fish/cmds.c:4834 fish/cmds.c:4854 fish/cmds.c:4886 fish/cmds.c:4901
-#: fish/cmds.c:4915 fish/cmds.c:4937 fish/cmds.c:4958 fish/cmds.c:4979
-#: fish/cmds.c:4999 fish/cmds.c:5014 fish/cmds.c:5034 fish/cmds.c:5126
-#: fish/cmds.c:5144 fish/cmds.c:5162 fish/cmds.c:5180 fish/cmds.c:5196
-#: fish/cmds.c:5215 fish/cmds.c:5249 fish/cmds.c:5264 fish/cmds.c:5284
-#: fish/cmds.c:5299 fish/cmds.c:5333 fish/cmds.c:5351 fish/cmds.c:5369
-#: fish/cmds.c:5387 fish/cmds.c:5407 fish/cmds.c:5422 fish/cmds.c:5439
-#: fish/cmds.c:5456 fish/cmds.c:5476 fish/cmds.c:5495 fish/cmds.c:5514
-#: fish/cmds.c:5533 fish/cmds.c:5554 fish/cmds.c:5593 fish/cmds.c:5614
-#: fish/cmds.c:5652 fish/cmds.c:5667 fish/cmds.c:5683 fish/cmds.c:5702
-#: fish/cmds.c:5723 fish/cmds.c:5743 fish/cmds.c:5759 fish/cmds.c:5776
-#: fish/cmds.c:5795 fish/cmds.c:5870 fish/cmds.c:5909 fish/cmds.c:5986
-#: fish/cmds.c:6060 fish/cmds.c:6095 fish/cmds.c:6116 fish/cmds.c:6135
-#: fish/cmds.c:6156 fish/cmds.c:6176 fish/cmds.c:6199 fish/cmds.c:6240
-#: fish/cmds.c:6279 fish/cmds.c:6298 fish/cmds.c:6315 fish/cmds.c:6331
-#: fish/cmds.c:6346 fish/cmds.c:6362 fish/cmds.c:6387 fish/cmds.c:6409
-#: fish/cmds.c:6431 fish/cmds.c:6453 fish/cmds.c:6475 fish/cmds.c:6497
-#: fish/cmds.c:6519 fish/cmds.c:6541 fish/cmds.c:6563 fish/cmds.c:6585
-#: fish/cmds.c:6607 fish/cmds.c:6629 fish/cmds.c:6650 fish/cmds.c:6671
-#: fish/cmds.c:6690 fish/cmds.c:6709 fish/cmds.c:6728 fish/cmds.c:6746
-#: fish/cmds.c:6767 fish/cmds.c:6803 fish/cmds.c:6818 fish/cmds.c:6833
-#: fish/cmds.c:6850 fish/cmds.c:6867 fish/cmds.c:6882 fish/cmds.c:6897
-#: fish/cmds.c:6912 fish/cmds.c:6927 fish/cmds.c:6944 fish/cmds.c:6978
-#: fish/cmds.c:7016 fish/cmds.c:7048 fish/cmds.c:7063 fish/cmds.c:7078
-#: fish/cmds.c:7091 fish/cmds.c:7105 fish/cmds.c:7123 fish/cmds.c:7159
-#: fish/cmds.c:7195 fish/cmds.c:7232 fish/cmds.c:7270 fish/cmds.c:7309
-#: fish/cmds.c:7348 fish/cmds.c:7384 fish/cmds.c:7399 fish/cmds.c:7420
-#: fish/cmds.c:7440 fish/cmds.c:7460 fish/cmds.c:7478 fish/cmds.c:7496
-#: fish/cmds.c:7530 fish/cmds.c:7600 fish/cmds.c:7638 fish/cmds.c:7694
-#: fish/cmds.c:7718 fish/cmds.c:7742 fish/cmds.c:7768 fish/cmds.c:7825
-#: fish/cmds.c:7844 fish/cmds.c:7887 fish/cmds.c:7905 fish/cmds.c:7942
-#: fish/cmds.c:7977 fish/cmds.c:7995 fish/cmds.c:8015 fish/cmds.c:8070
-#: fish/cmds.c:8088 fish/cmds.c:8108 fish/cmds.c:8128 fish/cmds.c:8145
-#: fish/cmds.c:8163 fish/cmds.c:8188 fish/cmds.c:8206 fish/cmds.c:8224
-#: fish/cmds.c:8242 fish/cmds.c:8260 fish/cmds.c:8280 fish/cmds.c:8313
-#: fish/cmds.c:8329 fish/cmds.c:8350 fish/cmds.c:8370 fish/cmds.c:8384
-#: fish/cmds.c:8398 fish/cmds.c:8433 fish/cmds.c:8470 fish/cmds.c:8508
-#: fish/cmds.c:8562 fish/cmds.c:8582 fish/cmds.c:8616 fish/cmds.c:8630
-#: fish/cmds.c:8647 fish/cmds.c:8685 fish/cmds.c:8706 fish/cmds.c:8728
-#: fish/cmds.c:8751 fish/cmds.c:8790 fish/cmds.c:8813 fish/cmds.c:8849
-#: fish/cmds.c:8878 fish/cmds.c:8907 fish/cmds.c:8934 fish/cmds.c:8951
-#: fish/cmds.c:8981 fish/cmds.c:8999 fish/cmds.c:9017 fish/cmds.c:9033
-#: fish/cmds.c:9048 fish/cmds.c:9069 fish/cmds.c:9088 fish/cmds.c:9105
-#: fish/cmds.c:9145 fish/cmds.c:9186 fish/cmds.c:9228 fish/cmds.c:9265
-#: fish/cmds.c:9282 fish/cmds.c:9300 fish/cmds.c:9318 fish/cmds.c:9337
-#: fish/cmds.c:9356 fish/cmds.c:9375 fish/cmds.c:9394 fish/cmds.c:9413
-#: fish/cmds.c:9433 fish/cmds.c:9469 fish/cmds.c:9518
+#: fish/cmds.c:3512 fish/cmds.c:3526 fish/cmds.c:3542 fish/cmds.c:3559
+#: fish/cmds.c:3576 fish/cmds.c:3594 fish/cmds.c:3613 fish/cmds.c:3629
+#: fish/cmds.c:3647 fish/cmds.c:3663 fish/cmds.c:3681 fish/cmds.c:3697
+#: fish/cmds.c:3714 fish/cmds.c:3729 fish/cmds.c:3747 fish/cmds.c:3762
+#: fish/cmds.c:3778 fish/cmds.c:3794 fish/cmds.c:3810 fish/cmds.c:3826
+#: fish/cmds.c:3842 fish/cmds.c:3860 fish/cmds.c:3893 fish/cmds.c:3909
+#: fish/cmds.c:3925 fish/cmds.c:3944 fish/cmds.c:3959 fish/cmds.c:3977
+#: fish/cmds.c:3992 fish/cmds.c:4010 fish/cmds.c:4025 fish/cmds.c:4043
+#: fish/cmds.c:4058 fish/cmds.c:4077 fish/cmds.c:4096 fish/cmds.c:4114
+#: fish/cmds.c:4134 fish/cmds.c:4153 fish/cmds.c:4173 fish/cmds.c:4193
+#: fish/cmds.c:4213 fish/cmds.c:4232 fish/cmds.c:4251 fish/cmds.c:4271
+#: fish/cmds.c:4291 fish/cmds.c:4311 fish/cmds.c:4326 fish/cmds.c:4342
+#: fish/cmds.c:4363 fish/cmds.c:4419 fish/cmds.c:4437 fish/cmds.c:4454
+#: fish/cmds.c:4471 fish/cmds.c:4492 fish/cmds.c:4560 fish/cmds.c:4580
+#: fish/cmds.c:4600 fish/cmds.c:4620 fish/cmds.c:4640 fish/cmds.c:4660
+#: fish/cmds.c:4679 fish/cmds.c:4698 fish/cmds.c:4717 fish/cmds.c:4732
+#: fish/cmds.c:4751 fish/cmds.c:4771 fish/cmds.c:4791 fish/cmds.c:4814
+#: fish/cmds.c:4867 fish/cmds.c:4882 fish/cmds.c:4900 fish/cmds.c:4933
+#: fish/cmds.c:4952 fish/cmds.c:4968 fish/cmds.c:4984 fish/cmds.c:5003
+#: fish/cmds.c:5025 fish/cmds.c:5047 fish/cmds.c:5067 fish/cmds.c:5084
+#: fish/cmds.c:5101 fish/cmds.c:5118 fish/cmds.c:5135 fish/cmds.c:5152
+#: fish/cmds.c:5169 fish/cmds.c:5186 fish/cmds.c:5205 fish/cmds.c:5228
+#: fish/cmds.c:5264 fish/cmds.c:5281 fish/cmds.c:5304 fish/cmds.c:5326
+#: fish/cmds.c:5347 fish/cmds.c:5367 fish/cmds.c:5386 fish/cmds.c:5406
+#: fish/cmds.c:5424 fish/cmds.c:5442 fish/cmds.c:5456 fish/cmds.c:5472
+#: fish/cmds.c:5492 fish/cmds.c:5511 fish/cmds.c:5530 fish/cmds.c:5549
+#: fish/cmds.c:5568 fish/cmds.c:5588 fish/cmds.c:5628 fish/cmds.c:5685
+#: fish/cmds.c:5706 fish/cmds.c:5727 fish/cmds.c:5748 fish/cmds.c:5766
+#: fish/cmds.c:5788 fish/cmds.c:5826 fish/cmds.c:5848 fish/cmds.c:5927
+#: fish/cmds.c:5966 fish/cmds.c:5981 fish/cmds.c:5998 fish/cmds.c:6012
+#: fish/cmds.c:6028 fish/cmds.c:6050 fish/cmds.c:6072 fish/cmds.c:6094
+#: fish/cmds.c:6116 fish/cmds.c:6138 fish/cmds.c:6160 fish/cmds.c:6180
+#: fish/cmds.c:6197 fish/cmds.c:6214 fish/cmds.c:6233 fish/cmds.c:6252
+#: fish/cmds.c:6272 fish/cmds.c:6308 fish/cmds.c:6327 fish/cmds.c:6346
+#: fish/cmds.c:6363 fish/cmds.c:6381 fish/cmds.c:6404 fish/cmds.c:6427
+#: fish/cmds.c:6451 fish/cmds.c:6474 fish/cmds.c:6495 fish/cmds.c:6518
+#: fish/cmds.c:6541 fish/cmds.c:6561 fish/cmds.c:6583 fish/cmds.c:6604
+#: fish/cmds.c:6627 fish/cmds.c:6644 fish/cmds.c:6661 fish/cmds.c:6679
+#: fish/cmds.c:6697 fish/cmds.c:6718 fish/cmds.c:6736 fish/cmds.c:6757
+#: fish/cmds.c:6777 fish/cmds.c:6795 fish/cmds.c:6816 fish/cmds.c:6839
+#: fish/cmds.c:6862 fish/cmds.c:6884 fish/cmds.c:6917 fish/cmds.c:6934
+#: fish/cmds.c:6951 fish/cmds.c:6975 fish/cmds.c:6998 fish/cmds.c:7021
+#: fish/cmds.c:7043 fish/cmds.c:7060 fish/cmds.c:7082 fish/cmds.c:7176
+#: fish/cmds.c:7196 fish/cmds.c:7216 fish/cmds.c:7236 fish/cmds.c:7254
+#: fish/cmds.c:7275 fish/cmds.c:7311 fish/cmds.c:7328 fish/cmds.c:7350
+#: fish/cmds.c:7367 fish/cmds.c:7403 fish/cmds.c:7423 fish/cmds.c:7443
+#: fish/cmds.c:7463 fish/cmds.c:7485 fish/cmds.c:7502 fish/cmds.c:7521
+#: fish/cmds.c:7540 fish/cmds.c:7562 fish/cmds.c:7583 fish/cmds.c:7604
+#: fish/cmds.c:7625 fish/cmds.c:7648 fish/cmds.c:7689 fish/cmds.c:7712
+#: fish/cmds.c:7751 fish/cmds.c:7768 fish/cmds.c:7787 fish/cmds.c:7808
+#: fish/cmds.c:7831 fish/cmds.c:7853 fish/cmds.c:7871 fish/cmds.c:7890
+#: fish/cmds.c:7911 fish/cmds.c:7988 fish/cmds.c:8029 fish/cmds.c:8108
+#: fish/cmds.c:8184 fish/cmds.c:8221 fish/cmds.c:8244 fish/cmds.c:8265
+#: fish/cmds.c:8288 fish/cmds.c:8310 fish/cmds.c:8335 fish/cmds.c:8378
+#: fish/cmds.c:8419 fish/cmds.c:8440 fish/cmds.c:8458 fish/cmds.c:8477
+#: fish/cmds.c:8494 fish/cmds.c:8512 fish/cmds.c:8539 fish/cmds.c:8563
+#: fish/cmds.c:8587 fish/cmds.c:8611 fish/cmds.c:8635 fish/cmds.c:8659
+#: fish/cmds.c:8683 fish/cmds.c:8707 fish/cmds.c:8731 fish/cmds.c:8755
+#: fish/cmds.c:8779 fish/cmds.c:8803 fish/cmds.c:8826 fish/cmds.c:8849
+#: fish/cmds.c:8870 fish/cmds.c:8891 fish/cmds.c:8912 fish/cmds.c:8932
+#: fish/cmds.c:8955 fish/cmds.c:8993 fish/cmds.c:9010 fish/cmds.c:9027
+#: fish/cmds.c:9046 fish/cmds.c:9065 fish/cmds.c:9082 fish/cmds.c:9099
+#: fish/cmds.c:9116 fish/cmds.c:9133 fish/cmds.c:9152 fish/cmds.c:9188
+#: fish/cmds.c:9228 fish/cmds.c:9261 fish/cmds.c:9278 fish/cmds.c:9295
+#: fish/cmds.c:9311 fish/cmds.c:9326 fish/cmds.c:9347 fish/cmds.c:9385
+#: fish/cmds.c:9423 fish/cmds.c:9462 fish/cmds.c:9502 fish/cmds.c:9543
+#: fish/cmds.c:9584 fish/cmds.c:9622 fish/cmds.c:9639 fish/cmds.c:9662
+#: fish/cmds.c:9684 fish/cmds.c:9706 fish/cmds.c:9726 fish/cmds.c:9746
+#: fish/cmds.c:9782 fish/cmds.c:9854 fish/cmds.c:9894 fish/cmds.c:9952
+#: fish/cmds.c:9978 fish/cmds.c:10004 fish/cmds.c:10032 fish/cmds.c:10091
+#: fish/cmds.c:10112 fish/cmds.c:10157 fish/cmds.c:10177 fish/cmds.c:10216
+#: fish/cmds.c:10253 fish/cmds.c:10273 fish/cmds.c:10295 fish/cmds.c:10352
+#: fish/cmds.c:10372 fish/cmds.c:10394 fish/cmds.c:10416 fish/cmds.c:10435
+#: fish/cmds.c:10455 fish/cmds.c:10482 fish/cmds.c:10502 fish/cmds.c:10522
+#: fish/cmds.c:10542 fish/cmds.c:10562 fish/cmds.c:10584 fish/cmds.c:10619
+#: fish/cmds.c:10637 fish/cmds.c:10660 fish/cmds.c:10682 fish/cmds.c:10697
+#: fish/cmds.c:10714 fish/cmds.c:10751 fish/cmds.c:10790 fish/cmds.c:10830
+#: fish/cmds.c:10886 fish/cmds.c:10908 fish/cmds.c:10944 fish/cmds.c:10959
+#: fish/cmds.c:10979 fish/cmds.c:11019 fish/cmds.c:11042 fish/cmds.c:11066
+#: fish/cmds.c:11091 fish/cmds.c:11132 fish/cmds.c:11157 fish/cmds.c:11195
+#: fish/cmds.c:11226 fish/cmds.c:11257 fish/cmds.c:11285 fish/cmds.c:11305
+#: fish/cmds.c:11337 fish/cmds.c:11357 fish/cmds.c:11377 fish/cmds.c:11394
+#: fish/cmds.c:11412 fish/cmds.c:11437 fish/cmds.c:11460 fish/cmds.c:11479
+#: fish/cmds.c:11523 fish/cmds.c:11568 fish/cmds.c:11616 fish/cmds.c:11657
+#: fish/cmds.c:11676 fish/cmds.c:11696 fish/cmds.c:11716 fish/cmds.c:11737
+#: fish/cmds.c:11758 fish/cmds.c:11779 fish/cmds.c:11800 fish/cmds.c:11821
+#: fish/cmds.c:11843 fish/cmds.c:11881 fish/cmds.c:11932 fish/cmds.c:11970
+#: fish/cmds.c:12026 fish/cmds.c:12049 fish/cmds.c:12162 fish/cmds.c:12191
+#: fish/cmds.c:12218 fish/cmds.c:12235 fish/cmds.c:12256 fish/cmds.c:12273
+#: fish/cmds.c:12295 fish/cmds.c:12335 fish/cmds.c:12356 fish/cmds.c:12416
+#: fish/cmds.c:12473 fish/cmds.c:12499 fish/cmds.c:12568 fish/cmds.c:12631
+#: fish/cmds.c:12653 fish/cmds.c:12744 fish/cmds.c:12837 fish/cmds.c:12930
+#: fish/cmds.c:13024 fish/cmds.c:13221 fish/cmds.c:13343 fish/cmds.c:13362
+#: fish/cmds.c:13382 fish/cmds.c:13399
 #, c-format
 msgid "type 'help %s' for help on %s\n"
 msgstr ""
 
-#: fish/cmds.c:2663 fish/cmds.c:3359 fish/cmds.c:3681 fish/cmds.c:3719
-#: fish/cmds.c:3738 fish/cmds.c:3869 fish/cmds.c:3924 fish/cmds.c:3943
-#: fish/cmds.c:3962 fish/cmds.c:4003 fish/cmds.c:4312 fish/cmds.c:4865
-#: fish/cmds.c:5046 fish/cmds.c:5065 fish/cmds.c:5084 fish/cmds.c:5103
-#: fish/cmds.c:5227 fish/cmds.c:5310 fish/cmds.c:5565 fish/cmds.c:5625
-#: fish/cmds.c:5806 fish/cmds.c:5825 fish/cmds.c:5844 fish/cmds.c:5881
-#: fish/cmds.c:5920 fish/cmds.c:5939 fish/cmds.c:5958 fish/cmds.c:5997
-#: fish/cmds.c:6016 fish/cmds.c:6035 fish/cmds.c:6071 fish/cmds.c:6212
-#: fish/cmds.c:6253 fish/cmds.c:6780 fish/cmds.c:6955 fish/cmds.c:6991
-#: fish/cmds.c:7027 fish/cmds.c:7135 fish/cmds.c:7170 fish/cmds.c:7206
-#: fish/cmds.c:7243 fish/cmds.c:7282 fish/cmds.c:7321 fish/cmds.c:7360
-#: fish/cmds.c:7509 fish/cmds.c:7543 fish/cmds.c:7556 fish/cmds.c:7569
-#: fish/cmds.c:7582 fish/cmds.c:7613 fish/cmds.c:7649 fish/cmds.c:7668
-#: fish/cmds.c:7781 fish/cmds.c:7800 fish/cmds.c:7857 fish/cmds.c:7870
-#: fish/cmds.c:7917 fish/cmds.c:7954 fish/cmds.c:8026 fish/cmds.c:8045
-#: fish/cmds.c:8295 fish/cmds.c:8410 fish/cmds.c:8445 fish/cmds.c:8482
-#: fish/cmds.c:8520 fish/cmds.c:8539 fish/cmds.c:8594 fish/cmds.c:8661
-#: fish/cmds.c:8763 fish/cmds.c:8829 fish/cmds.c:8861 fish/cmds.c:8890
-#: fish/cmds.c:8919 fish/cmds.c:8964 fish/cmds.c:9119 fish/cmds.c:9159
-#: fish/cmds.c:9202 fish/cmds.c:9242 fish/cmds.c:9448 fish/cmds.c:9484
-#: fish/cmds.c:9497 fish/cmds.c:9533
+#: fish/cmds.c:3870 fish/cmds.c:4910 fish/cmds.c:5240 fish/cmds.c:5598
+#: fish/cmds.c:5638 fish/cmds.c:5657 fish/cmds.c:5800 fish/cmds.c:5859
+#: fish/cmds.c:5878 fish/cmds.c:5897 fish/cmds.c:5940 fish/cmds.c:6283
+#: fish/cmds.c:6894 fish/cmds.c:7093 fish/cmds.c:7112 fish/cmds.c:7131
+#: fish/cmds.c:7150 fish/cmds.c:7286 fish/cmds.c:7377 fish/cmds.c:7658
+#: fish/cmds.c:7722 fish/cmds.c:7921 fish/cmds.c:7940 fish/cmds.c:7959
+#: fish/cmds.c:7998 fish/cmds.c:8039 fish/cmds.c:8058 fish/cmds.c:8077
+#: fish/cmds.c:8118 fish/cmds.c:8137 fish/cmds.c:8156 fish/cmds.c:8194
+#: fish/cmds.c:8347 fish/cmds.c:8390 fish/cmds.c:8967 fish/cmds.c:9162
+#: fish/cmds.c:9200 fish/cmds.c:9238 fish/cmds.c:9358 fish/cmds.c:9395
+#: fish/cmds.c:9433 fish/cmds.c:9472 fish/cmds.c:9513 fish/cmds.c:9554
+#: fish/cmds.c:9595 fish/cmds.c:9758 fish/cmds.c:9794 fish/cmds.c:9807
+#: fish/cmds.c:9820 fish/cmds.c:9833 fish/cmds.c:9866 fish/cmds.c:9904
+#: fish/cmds.c:9923 fish/cmds.c:10044 fish/cmds.c:10063 fish/cmds.c:10124
+#: fish/cmds.c:10137 fish/cmds.c:10188 fish/cmds.c:10227 fish/cmds.c:10305
+#: fish/cmds.c:10324 fish/cmds.c:10598 fish/cmds.c:10725 fish/cmds.c:10762
+#: fish/cmds.c:10801 fish/cmds.c:10841 fish/cmds.c:10860 fish/cmds.c:10919
+#: fish/cmds.c:10992 fish/cmds.c:11102 fish/cmds.c:11172 fish/cmds.c:11206
+#: fish/cmds.c:11237 fish/cmds.c:11268 fish/cmds.c:11317 fish/cmds.c:11494
+#: fish/cmds.c:11538 fish/cmds.c:11587 fish/cmds.c:11631 fish/cmds.c:11857
+#: fish/cmds.c:11895 fish/cmds.c:11908 fish/cmds.c:11946 fish/cmds.c:11981
+#: fish/cmds.c:12000 fish/cmds.c:12067 fish/cmds.c:12095 fish/cmds.c:12118
+#: fish/cmds.c:12373 fish/cmds.c:12434 fish/cmds.c:12520 fish/cmds.c:12588
+#: fish/cmds.c:12671 fish/cmds.c:12688 fish/cmds.c:12705 fish/cmds.c:12763
+#: fish/cmds.c:12780 fish/cmds.c:12797 fish/cmds.c:12856 fish/cmds.c:12873
+#: fish/cmds.c:12890 fish/cmds.c:12950 fish/cmds.c:12967 fish/cmds.c:12984
+#: fish/cmds.c:13046 fish/cmds.c:13069 fish/cmds.c:13097 fish/cmds.c:13114
+#: fish/cmds.c:13137 fish/cmds.c:13165 fish/cmds.c:13182 fish/cmds.c:13240
+#: fish/cmds.c:13257 fish/cmds.c:13280 fish/cmds.c:13303
 #, c-format
 msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:2669 fish/cmds.c:3365 fish/cmds.c:3687 fish/cmds.c:3725
-#: fish/cmds.c:3744 fish/cmds.c:3875 fish/cmds.c:3930 fish/cmds.c:3949
-#: fish/cmds.c:3968 fish/cmds.c:4009 fish/cmds.c:4318 fish/cmds.c:4871
-#: fish/cmds.c:5052 fish/cmds.c:5071 fish/cmds.c:5090 fish/cmds.c:5109
-#: fish/cmds.c:5233 fish/cmds.c:5316 fish/cmds.c:5571 fish/cmds.c:5631
-#: fish/cmds.c:5812 fish/cmds.c:5831 fish/cmds.c:5850 fish/cmds.c:5887
-#: fish/cmds.c:5926 fish/cmds.c:5945 fish/cmds.c:5964 fish/cmds.c:6003
-#: fish/cmds.c:6022 fish/cmds.c:6041 fish/cmds.c:6077 fish/cmds.c:6218
-#: fish/cmds.c:6259 fish/cmds.c:6786 fish/cmds.c:6961 fish/cmds.c:6997
-#: fish/cmds.c:7033 fish/cmds.c:7141 fish/cmds.c:7176 fish/cmds.c:7212
-#: fish/cmds.c:7249 fish/cmds.c:7288 fish/cmds.c:7327 fish/cmds.c:7366
-#: fish/cmds.c:7619 fish/cmds.c:7655 fish/cmds.c:7674 fish/cmds.c:7787
-#: fish/cmds.c:7923 fish/cmds.c:7960 fish/cmds.c:8032 fish/cmds.c:8051
-#: fish/cmds.c:8416 fish/cmds.c:8451 fish/cmds.c:8488 fish/cmds.c:8526
-#: fish/cmds.c:8545 fish/cmds.c:8600 fish/cmds.c:8667 fish/cmds.c:8769
-#: fish/cmds.c:9125 fish/cmds.c:9165 fish/cmds.c:9208 fish/cmds.c:9248
+#: fish/cmds.c:3876 fish/cmds.c:4916 fish/cmds.c:5246 fish/cmds.c:5604
+#: fish/cmds.c:5644 fish/cmds.c:5663 fish/cmds.c:5806 fish/cmds.c:5865
+#: fish/cmds.c:5884 fish/cmds.c:5903 fish/cmds.c:5946 fish/cmds.c:6289
+#: fish/cmds.c:6900 fish/cmds.c:7099 fish/cmds.c:7118 fish/cmds.c:7137
+#: fish/cmds.c:7156 fish/cmds.c:7292 fish/cmds.c:7383 fish/cmds.c:7664
+#: fish/cmds.c:7728 fish/cmds.c:7927 fish/cmds.c:7946 fish/cmds.c:7965
+#: fish/cmds.c:8004 fish/cmds.c:8045 fish/cmds.c:8064 fish/cmds.c:8083
+#: fish/cmds.c:8124 fish/cmds.c:8143 fish/cmds.c:8162 fish/cmds.c:8200
+#: fish/cmds.c:8353 fish/cmds.c:8396 fish/cmds.c:8973 fish/cmds.c:9168
+#: fish/cmds.c:9206 fish/cmds.c:9244 fish/cmds.c:9364 fish/cmds.c:9401
+#: fish/cmds.c:9439 fish/cmds.c:9478 fish/cmds.c:9519 fish/cmds.c:9560
+#: fish/cmds.c:9601 fish/cmds.c:9872 fish/cmds.c:9910 fish/cmds.c:9929
+#: fish/cmds.c:10050 fish/cmds.c:10194 fish/cmds.c:10233 fish/cmds.c:10311
+#: fish/cmds.c:10330 fish/cmds.c:10731 fish/cmds.c:10768 fish/cmds.c:10807
+#: fish/cmds.c:10847 fish/cmds.c:10866 fish/cmds.c:10925 fish/cmds.c:10998
+#: fish/cmds.c:11108 fish/cmds.c:11500 fish/cmds.c:11544 fish/cmds.c:11593
+#: fish/cmds.c:11637 fish/cmds.c:11987 fish/cmds.c:12073 fish/cmds.c:12101
+#: fish/cmds.c:12124 fish/cmds.c:12526 fish/cmds.c:12594 fish/cmds.c:13052
+#: fish/cmds.c:13075 fish/cmds.c:13120 fish/cmds.c:13143 fish/cmds.c:13263
+#: fish/cmds.c:13286
 #, c-format
 msgid "%s: %s: integer out of range\n"
 msgstr ""
 
-#: fish/cmds.c:10559
+#: fish/cmds.c:4362 fish/cmds.c:4491 fish/cmds.c:4813 fish/cmds.c:12048
+#: fish/cmds.c:12294 fish/cmds.c:12355 fish/cmds.c:12415 fish/cmds.c:12498
+#: fish/cmds.c:12567 fish/cmds.c:12652 fish/cmds.c:12743 fish/cmds.c:12836
+#: fish/cmds.c:12929 fish/cmds.c:13023 fish/cmds.c:13220
+#, c-format
+msgid "%s should have %d-%d parameter(s)\n"
+msgstr ""
+
+#: fish/cmds.c:4393 fish/cmds.c:4532 fish/cmds.c:4834 fish/cmds.c:12134
+#: fish/cmds.c:12311 fish/cmds.c:12388 fish/cmds.c:12444 fish/cmds.c:12536
+#: fish/cmds.c:12604 fish/cmds.c:12715 fish/cmds.c:12807 fish/cmds.c:12900
+#: fish/cmds.c:12994 fish/cmds.c:13192 fish/cmds.c:13318
+#, c-format
+msgid "%s: unknown optional argument \"%s\"\n"
+msgstr ""
+
+#: fish/cmds.c:4399 fish/cmds.c:4538 fish/cmds.c:4840 fish/cmds.c:12140
+#: fish/cmds.c:12317 fish/cmds.c:12394 fish/cmds.c:12450 fish/cmds.c:12542
+#: fish/cmds.c:12610 fish/cmds.c:12721 fish/cmds.c:12813 fish/cmds.c:12906
+#: fish/cmds.c:13000 fish/cmds.c:13198 fish/cmds.c:13324
+#, c-format
+msgid "%s: optional argument \"%s\" given twice\n"
+msgstr ""
+
+#: fish/cmds.c:13419
 #, 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:46
 #, 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:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:138
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:183
+#: fish/copy.c:209
 #, 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:220
+#, c-format
+msgid "copy-out: target '%s' is not a directory\n"
+msgstr ""
+
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
 
-#: fish/edit.c:44
+#: fish/display.c:42
 #, c-format
-msgid "use '%s filename' to edit a file\n"
+msgid "display filename\n"
 msgstr ""
 
-#: fish/fish.c:113 fuse/guestmount.c:880
+#: 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:117
+#: fish/fish.c:105
 #, 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"
 "  -f|--file file       Read commands from file\n"
+"  --format[=raw|..]    Force disk format for -a option\n"
 "  -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"
@@ -1588,124 +2162,109 @@ 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:225 fuse/guestmount.c:977
-#, c-format
-msgid "guestfs_create: failed to create handle\n"
-msgstr ""
-
-#: fish/fish.c:264
+#: fish/fish.c:246
 #, c-format
 msgid "%s: --listen=PID: PID was not a number: %s\n"
 msgstr ""
 
-#: fish/fish.c:271
+#: fish/fish.c:253
 #, c-format
 msgid ""
 "%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
 msgstr ""
 
-#: fish/fish.c:288 fuse/guestmount.c:1022
-#, c-format
-msgid "%s: unknown long option: %s (%d)\n"
-msgstr ""
-
-#: fish/fish.c:357
+#: fish/fish.c:303
 #, c-format
 msgid "%s: only one -f parameter can be given\n"
 msgstr ""
 
-#: fish/fish.c:497
+#: fish/fish.c:476
 #, c-format
 msgid "%s: cannot use --listen and --remote options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:505
+#: fish/fish.c:484
 #, c-format
 msgid "%s: extra parameters on the command line with --listen flag\n"
 msgstr ""
 
-#: fish/fish.c:511
+#: fish/fish.c:490
 #, c-format
 msgid "%s: cannot use --listen and --file options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:568
-#, c-format
-msgid "guestfish: could not access termcap or terminfo database.\n"
-msgstr ""
-
-#: fish/fish.c:572
-#, c-format
-msgid "guestfish: terminal type \"%s\" not defined.\n"
-msgstr ""
-
-#: fish/fish.c:619
-#, c-format
-msgid "guestfish: '%s' could not be mounted.  Did you mean one of these?\n"
-msgstr ""
-
-#: fish/fish.c:638
-#, c-format
-msgid "guestfish: too many drives added on the command line\n"
-msgstr ""
-
-#: fish/fish.c:802
+#: fish/fish.c:642
 #, 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:889
-#, c-format
-msgid "%s: unterminated double quote\n"
-msgstr ""
-
-#: fish/fish.c:895 fish/fish.c:912
+#: fish/fish.c:793 fish/fish.c:809
 #, c-format
 msgid "%s: command arguments not separated by whitespace\n"
 msgstr ""
 
-#: fish/fish.c:906
+#: fish/fish.c:803
 #, c-format
 msgid "%s: unterminated single quote\n"
 msgstr ""
 
-#: fish/fish.c:961
+#: fish/fish.c:833
 #, c-format
 msgid "%s: internal error parsing string at '%s'\n"
 msgstr ""
 
-#: fish/fish.c:978
+#: fish/fish.c:850
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr ""
 
-#: fish/fish.c:1007
+#: fish/fish.c:925
+#, c-format
+msgid "%s: invalid escape sequence in string (starting at offset %d)\n"
+msgstr ""
+
+#: fish/fish.c:934
+#, c-format
+msgid "%s: unterminated double quote\n"
+msgstr ""
+
+#: fish/fish.c:999
 #, c-format
 msgid "%s: empty command on command line\n"
 msgstr ""
 
-#: fish/fish.c:1148
+#: fish/fish.c:1146
 msgid "display a list of commands or help on a command"
 msgstr ""
 
-#: fish/fish.c:1150
+#: fish/fish.c:1148
 msgid "quit guestfish"
 msgstr ""
 
-#: fish/fish.c:1161
+#: fish/fish.c:1159
 #, c-format
 msgid ""
 "help - display a list of commands or help on a command\n"
@@ -1713,19 +2272,19 @@ msgid ""
 "     help\n"
 msgstr ""
 
-#: fish/fish.c:1169
+#: fish/fish.c:1167
 #, c-format
 msgid ""
 "quit - quit guestfish\n"
 "     quit\n"
 msgstr ""
 
-#: fish/fish.c:1174
+#: fish/fish.c:1172
 #, c-format
 msgid "%s: command not known, use -h to list all commands\n"
 msgstr ""
 
-#: fish/fish.c:1190
+#: fish/fish.c:1188
 #, c-format
 msgid ""
 "Did you mean to open a disk image?  guestfish -a disk.img\n"
@@ -1733,26 +2292,73 @@ msgid ""
 "For complete documentation:         man guestfish\n"
 msgstr ""
 
-#: fish/fish.c:1347
+#: fish/fish.c:1197
+#, c-format
+msgid "%s:%d: libguestfs: error: %s\n"
+msgstr ""
+
+#: fish/fish.c:1353
 #, c-format
 msgid "Runaway quote in string \"%s\"\n"
 msgstr ""
 
-#: fish/fish.c:1683
+#: fish/fish.c:1550
 #, 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/glob.c:52
+#: fish/fish.c:1570
+#, c-format
+msgid ""
+"%s: drive '%c:' not found.  To list available drives do:\n"
+"  inspect-get-drive-mappings %s\n"
+msgstr ""
+
+#: fish/fish.c:1589
+#, 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
 #, c-format
 msgid "use 'glob command [args...]'\n"
 msgstr ""
 
-#: fish/glob.c:72
+#: fish/glob.c:73
 #, c-format
 msgid "glob: guestfs_glob_expand call failed: %s\n"
 msgstr ""
 
+#: fish/help.c:38
+#, c-format
+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/help.c:44
+#, c-format
+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/help.c:52
+#, c-format
+msgid ""
+"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"
@@ -1776,47 +2382,99 @@ msgstr ""
 msgid "hexedit: invalid range\n"
 msgstr ""
 
-#: fish/inspect.c:57
+#: fish/inspect.c:77
+#, c-format
+msgid "%s: don't use --live and -i options together\n"
+msgstr ""
+
+#: fish/inspect.c:90
 #, c-format
-msgid "guestfish: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:62
+#: fish/inspect.c:111
 #, c-format
 msgid ""
-"guestfish: multi-boot operating systems are not supported by the -i option\n"
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
+
+#: fish/inspect.c:170
+#, c-format
+msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:101
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:114
+#: fish/inspect.c:195
 #, 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:38
+#, c-format
+msgid "%s: too many drives added on the command line\n"
+msgstr ""
+
+#: fish/options.c:152
+#, c-format
+msgid "%s: '%s' could not be mounted.  Did you mean one of these?\n"
+msgstr ""
+
 #: fish/prep.c:37
 #, c-format
 msgid ""
@@ -1932,43 +2590,53 @@ msgstr ""
 msgid "failed to create filesystem (%s): %s"
 msgstr ""
 
-#: fish/rc.c:249
+#: fish/rc.c:257
 #, c-format
 msgid "guestfish: protocol error: could not read 'hello' message\n"
 msgstr ""
 
-#: fish/rc.c:254
+#: fish/rc.c:262
 #, 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:329 fish/rc.c:343
+#: fish/rc.c:337 fish/rc.c:351
 #, c-format
 msgid "guestfish: remote: looks like the server is not running\n"
 msgstr ""
 
-#: fish/rc.c:355 fish/rc.c:369
+#: fish/rc.c:363 fish/rc.c:377
 #, c-format
 msgid "guestfish: protocol error: could not send initial greeting to server\n"
 msgstr ""
 
-#: fish/rc.c:380
+#: fish/rc.c:388
 #, c-format
 msgid "guestfish: protocol error: could not decode reply from server\n"
 msgstr ""
 
-#: fish/reopen.c:36
+#: fish/reopen.c:38
 #, c-format
 msgid "'reopen' command takes no parameters\n"
 msgstr ""
 
-#: fish/reopen.c:46
+#: fish/reopen.c:48
 #, c-format
 msgid "reopen: guestfs_create: failed to create handle\n"
 msgstr ""
 
+#: fish/setenv.c:34
+#, c-format
+msgid "use '%s VAR value' to set an environment variable\n"
+msgstr ""
+
+#: fish/setenv.c:56
+#, c-format
+msgid "use '%s VAR' to unset an environment variable\n"
+msgstr ""
+
 #: fish/supported.c:66
 msgid "yes"
 msgstr ""
@@ -1977,176 +2645,210 @@ msgstr ""
 msgid "no"
 msgstr ""
 
-#: fish/time.c:35
+#: fish/time.c:36
 #, c-format
 msgid "use 'time command [args...]'\n"
 msgstr ""
 
-#: fish/virt.c:72
-#, c-format
-msgid "guestfish: could not connect to libvirt (code %d, domain %d): %s\n"
-msgstr ""
-
-#: fish/virt.c:80
-#, c-format
-msgid "guestfish: no libvirt domain called '%s': %s\n"
-msgstr ""
-
-#: fish/virt.c:88
+#: fuse/guestmount.c:912
 #, c-format
-msgid "guestfish: error getting domain info about '%s': %s\n"
+msgid ""
+"%s: FUSE module for libguestfs\n"
+"%s lets you mount a virtual machine filesystem\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"
+"  --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"
+"  -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 ""
 
-#: fish/virt.c:93
+#: fuse/guestmount.c:1131
 #, 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"
+msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
 msgstr ""
 
-#: fish/virt.c:104
+#: fuse/guestmount.c:1141
 #, c-format
-msgid "guestfish: error reading libvirt XML information about '%s': %s\n"
+msgid "%s: --live is not compatible with --ro option\n"
 msgstr ""
 
-#: fish/virt.c:114
+#: fuse/guestmount.c:1148
 #, c-format
-msgid "guestfish: unable to parse XML information returned by libvirt\n"
+msgid "%s: --live is not compatible with -i option\n"
 msgstr ""
 
-#: fish/virt.c:120
+#: fuse/guestmount.c:1163
 #, c-format
-msgid "guestfish: unable to create new XPath context\n"
+msgid "%s: with --live, you must use exactly one -d option\n"
 msgstr ""
 
-#: fish/virt.c:127 fish/virt.c:138
+#: fuse/guestmount.c:1170
 #, c-format
-msgid "guestfish: unable to evaluate XPath expression\n"
+msgid "%s: --live is not compatible with -a option\n"
 msgstr ""
 
-#: fish/virt.c:145
+#: fuse/guestmount.c:1179
 #, c-format
-msgid "guestfish: libvirt domain '%s' has no disks\n"
+msgid "%s: you must specify a mountpoint in the host filesystem\n"
 msgstr ""
 
-#: fuse/guestmount.c:884
+#: inspector/virt-inspector.c:82
 #, 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"
+"%s: display information about a virtual machine\n"
+"Copyright (C) 2010 Red Hat Inc.\n"
 "Usage:\n"
-"  %s [--options] [-- [--FUSE-options]] mountpoint\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"
-"  --dir-cache-timeout  Set readdir cache timeout (default 5 sec)\n"
-"  --fuse-help          Display extra FUSE options\n"
-"  --help               Display help message and exit\n"
-"  -m|--mount dev[:mnt] 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"
+"  -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"
+"  --xpath query        Perform an XPath query\n"
+"For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: fuse/guestmount.c:1096
+#: inspector/virt-inspector.c:255
 #, c-format
-msgid "%s: must have at least one -a and at least one -m option\n"
+msgid "%s: cannot use --xpath together with other options.\n"
 msgstr ""
 
-#: fuse/guestmount.c:1104
+#: inspector/virt-inspector.c:288
 #, c-format
-msgid "%s: you must specify a mountpoint in the host filesystem\n"
+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:200
-msgid "virt-inspector: no image or VM names given"
+#: inspector/virt-inspector.c:313
+#, c-format
+msgid "%s: XML write error at \"%s\": %m\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:294
-msgid "--fish output is only possible with a single OS\n"
+#: inspector/virt-inspector.c:325
+#, c-format
+msgid "%s: xmlOutputBufferCreateFd: failed to open stdout\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:324
-msgid ""
-"virt-inspector: no YAML support, try installing perl-YAML or libyaml-perl\n"
+#: inspector/virt-inspector.c:333
+#, c-format
+msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:363
-msgid "  Mountpoints:\n"
+#: inspector/virt-inspector.c:827
+#, c-format
+msgid "%s: unable to parse XML from stdin\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:369
-msgid "  Filesystems:\n"
+#: inspector/virt-inspector.c:833
+#, c-format
+msgid "%s: unable to create new XPath context\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:387
-msgid "  Modprobe aliases:\n"
+#: inspector/virt-inspector.c:840
+#, c-format
+msgid "%s: unable to evaluate XPath expression\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:398
-msgid "  Initrd modules:\n"
+#: inspector/virt-inspector.c:851
+#, c-format
+msgid "%s: xmlSaveToFd failed\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:407
-msgid "  Applications:\n"
+#: inspector/virt-inspector.c:858
+#, c-format
+msgid "%s: xmlNewDoc failed\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:414
-msgid "  Kernels:\n"
+#: inspector/virt-inspector.c:863
+#, c-format
+msgid "%s: xmlCopyNode failed\n"
 msgstr ""
 
-#: inspector/virt-inspector.pl:426
-msgid "  Windows Registry entries:\n"
+#: inspector/virt-inspector.c:870
+#, c-format
+msgid "%s: xmlSaveDoc failed\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:152
+#: 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:158
+#: perl/lib/Sys/Guestfs/Lib.pm:164
 msgid "open_guest: first argument contains undefined element"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:166
+#: 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:171
+#: 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:176
+#: perl/lib/Sys/Guestfs/Lib.pm:184
 msgid "open_guest: too many domains listed on command line"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:183
+#: perl/lib/Sys/Guestfs/Lib.pm:191
 msgid "open_guest: cannot connect to libvirt"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:202
+#: 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:205
+#: 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:217
+#: 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:1074
+#: perl/lib/Sys/Guestfs/Lib.pm:827
 msgid ""
 "No operating system could be detected inside this disk image.\n"
 "\n"
@@ -2158,740 +2860,724 @@ msgid ""
 "information about the disk image as possible.\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1147
-#, perl-brace-format
-msgid "unknown filesystem label {label}\n"
-msgstr ""
-
-#: perl/lib/Sys/Guestfs/Lib.pm:1157
-#, perl-brace-format
-msgid "unknown filesystem UUID {uuid}\n"
-msgstr ""
-
-#: perl/lib/Sys/Guestfs/Lib.pm:1180
+#: perl/lib/Sys/Guestfs/Lib.pm:945
 #, perl-brace-format
 msgid "unknown filesystem {fs}\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1364
+#: perl/lib/Sys/Guestfs/Lib.pm:1023
 #, perl-brace-format
 msgid "Error running rpm -qa: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1390
+#: perl/lib/Sys/Guestfs/Lib.pm:1049
 #, perl-brace-format
 msgid "Error running dpkg-query: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1455
+#: perl/lib/Sys/Guestfs/Lib.pm:1114
 msgid "Can't find grub on guest"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1510
+#: perl/lib/Sys/Guestfs/Lib.pm:1169
 #, perl-brace-format
 msgid "Grub entry {title} has no kernel"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1541
+#: perl/lib/Sys/Guestfs/Lib.pm:1200
 #, perl-brace-format
 msgid "grub refers to {path}, which doesn't exist\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1564
+#: perl/lib/Sys/Guestfs/Lib.pm:1223
 #, perl-brace-format
 msgid "Grub entry {title} does not specify an initrd"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1635
+#: perl/lib/Sys/Guestfs/Lib.pm:1292
 #, perl-brace-format
 msgid "Didn't find modules directory {modules} for kernel {path}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1643
+#: perl/lib/Sys/Guestfs/Lib.pm:1300
 #, perl-brace-format
 msgid "Couldn't guess kernel version number from path for kernel {path}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1697
+#: perl/lib/Sys/Guestfs/Lib.pm:1354
 #, perl-brace-format
 msgid "{path} doesn't match augeas pattern"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1736
+#: perl/lib/Sys/Guestfs/Lib.pm:1393
 #, perl-brace-format
 msgid "{filename}: could not read initrd format"
 msgstr ""
 
-#: src/appliance.c:136
+#: rescue/virt-rescue.c:66
 #, c-format
 msgid ""
-"cannot find any suitable libguestfs supermin or ordinary appliance on "
-"LIBGUESTFS_PATH (search path: %s)"
-msgstr ""
-
-#: src/appliance.c:389
-msgid "external command failed, see earlier error messages"
+"%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"
+"  --smp N              Enable SMP with N >= 2 virtual CPUs\n"
+"  --suggest            Suggest mount commands for this guest\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 ""
 
-#: src/guestfs.c:176
+#: rescue/virt-rescue.c:167
 #, c-format
-msgid "guestfs_close: called twice on the same handle\n"
+msgid "%s: could not parse --smp parameter '%s'\n"
 msgstr ""
 
-#: src/guestfs.c:281
+#: rescue/virt-rescue.c:172
 #, c-format
-msgid "libguestfs: error: %s\n"
+msgid "%s: --smp parameter '%s' should be >= 1\n"
 msgstr ""
 
-#: src/inspect.c:939
+#: rescue/virt-rescue.c:202
 #, c-format
-msgid "cannot resolve Windows %%SYSTEMROOT%%"
+msgid "%s: could not parse memory size '%s'\n"
 msgstr ""
 
-#: src/inspect.c:1162
-msgid "no inspection data: call guestfs_inspect_os first"
-msgstr ""
-
-#: src/inspect.c:1174
+#: rescue/virt-rescue.c:372
 #, 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:93
-msgid "command line cannot be altered after qemu subprocess launched"
-msgstr ""
-
-#: src/launch.c:107
-msgid "guestfs_config: parameter must begin with '-' character"
+"Inspecting the virtual machine or disk image ...\n"
+"\n"
 msgstr ""
 
-#: src/launch.c:121
+#: rescue/virt-rescue.c:391
 #, c-format
-msgid "guestfs_config: parameter '%s' isn't allowed"
-msgstr ""
-
-#: src/launch.c:142 src/launch.c:179 src/launch.c:212
-msgid "filename cannot contain ',' (comma) character"
+msgid ""
+"This disk contains one or more operating systems.  You can use these mount\n"
+"commands in virt-rescue (at the ><rescue> prompt) to mount the filesystems.\n"
+"\n"
 msgstr ""
 
-#: src/launch.c:238
-msgid "you must call guestfs_add_drive before guestfs_launch"
+#: rescue/virt-rescue.c:401
+#, c-format
+msgid ""
+"# %s is the root of a %s operating system\n"
+"# type: %s, distro: %s, version: %d.%d\n"
+"# %s\n"
+"\n"
 msgstr ""
 
-#: src/launch.c:243
-msgid "the libguestfs handle has already been launched"
+#: rescue/virt-rescue.c:458
+#, c-format
+msgid ""
+"This disk contains no filesystems that we recognize.\n"
+"\n"
+"However you can still use virt-rescue on the disk image, to try to mount\n"
+"filesystems that are not recognized by libguestfs, or to create partitions,\n"
+"logical volumes and filesystems on a blank disk.\n"
 msgstr ""
 
-#: src/launch.c:255
+#: rescue/virt-rescue.c:465
 #, c-format
-msgid "%s: cannot create temporary directory"
+msgid ""
+"This disk contains one or more filesystems, but we don't recognize any\n"
+"operating system.  You can use these mount commands in virt-rescue (at the\n"
+"><rescue> prompt) to mount these filesystems.\n"
+"\n"
 msgstr ""
 
-#: src/launch.c:603
-msgid "guestfs_launch failed, see earlier error messages"
+#: rescue/virt-rescue.c:470
+#, c-format
+msgid "# %s has type '%s'\n"
 msgstr ""
 
-#: src/launch.c:616
-msgid "qemu launched and contacted daemon, but state != READY"
+#: rescue/virt-rescue.c:594
+#, c-format
+msgid "%s: unknown child exit status (%d)\n"
 msgstr ""
 
-#: src/launch.c:756
+#: src/appliance.c:182
 #, c-format
 msgid ""
-"%s: command failed: If qemu is located on a non-standard path, try setting "
-"the LIBGUESTFS_QEMU environment variable."
+"cannot find any suitable libguestfs supermin or ordinary appliance on "
+"LIBGUESTFS_PATH (search path: %s)"
 msgstr ""
 
-#: src/launch.c:848
-msgid "qemu has not been launched yet"
+#: src/appliance.c:332
+#, c-format
+msgid "security: cached appliance %s is not owned by UID %d"
 msgstr ""
 
-#: src/launch.c:859
-msgid "no subprocess to kill"
+#: src/appliance.c:337
+#, c-format
+msgid "security: cached appliance %s is not a directory (mode %o)"
 msgstr ""
 
-#: src/proto.c:143
+#: src/appliance.c:342
 #, c-format
-msgid "guestfs_set_busy: called when in state %d != READY"
+msgid "security: cached appliance %s is writable by group or other (mode %o)"
 msgstr ""
 
-#: src/proto.c:166
-#, c-format
-msgid "guestfs_end_busy: called when in state %d"
+#: src/appliance.c:672
+msgid "external command failed, see earlier error messages"
 msgstr ""
 
-#: src/proto.c:281
-#, c-format
-msgid ""
-"check_for_daemon_cancellation_or_eof: read 0x%x from daemon, expected 0x%x\n"
+#: src/dbdump.c:85
+msgid "unexpected end of output from db_dump command before end of header"
 msgstr ""
 
-#: src/proto.c:453 src/proto.c:514
-msgid "unexpected end of file when reading from daemon"
+#: src/dbdump.c:98 src/dbdump.c:110
+msgid "unexpected line from db_dump command, no space prefix"
 msgstr ""
 
-#: src/proto.c:474
-#, c-format
-msgid "received magic signature from guestfsd, but in state %d"
+#: src/dbdump.c:127
+msgid "unexpected end of output from db_dump command before end of data"
 msgstr ""
 
-#: src/proto.c:491
-#, c-format
-msgid "message length (%u) > maximum possible size (%d)"
+#: src/dbdump.c:208
+msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/proto.c:641
+#: src/filearch.c:152
 #, c-format
-msgid "guestfs___send: state %d != BUSY"
+msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/proto.c:663
-msgid "xdr_guestfs_message_header failed"
+#: src/filearch.c:265
+msgid ""
+"file-architecture API not available since this version of libguestfs was "
+"compiled without the libmagic library"
 msgstr ""
 
-#: src/proto.c:672
-msgid "dispatch failed to marshal args"
+#: src/guestfs.c:177
+#, c-format
+msgid "guestfs_close: called twice on the same handle\n"
 msgstr ""
 
-#: src/proto.c:802
+#: src/guestfs.c:344
 #, c-format
-msgid "send_file_chunk: state %d != READY"
+msgid "warning: %s"
 msgstr ""
 
-#: src/proto.c:818
+#: src/guestfs.c:405
 #, c-format
-msgid "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"
+msgid "libguestfs: error: %s\n"
 msgstr ""
 
-#: src/proto.c:941
+#: src/guestfs.c:983
 #, c-format
-msgid "%s: error in chunked encoding"
+msgid "<truncated, original size %zu bytes>"
 msgstr ""
 
-#: src/proto.c:969
-msgid "write to daemon socket"
+#: src/inspect.c:293
+msgid "not a Windows guest, or systemroot could not be determined"
 msgstr ""
 
-#: src/proto.c:992
-msgid "receive_file_data: parse error in reply callback"
+#: src/inspect.c:309
+msgid "not a Windows guest, or CurrentControlSet could not be determined"
 msgstr ""
 
-#: src/proto.c:997
-msgid "receive_file_data: unexpected flag received when reading file chunks"
+#: src/inspect.c:537 src/inspect_apps.c:610
+msgid ""
+"inspection API not available since this version of libguestfs was compiled "
+"without the hivex library"
 msgstr ""
 
-#: src/proto.c:1005
-msgid "failed to parse file chunk"
+#: src/inspect.c:752 src/inspect_fs.c:503 src/inspect_fs.c:547
+#: src/inspect_fs_unix.c:228 src/inspect_fs_unix.c:728
+#: src/inspect_fs_unix.c:1309
+#, c-format
+msgid "size of %s is unreasonably large (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/proto.c:1014
-msgid "file receive cancelled by daemon"
+#: src/inspect.c:788
+msgid "no inspection data: call guestfs_inspect_os first"
 msgstr ""
 
-#: test-tool/test-tool.c:82
+#: src/inspect.c:800
 #, c-format
 msgid ""
-"libguestfs-test-tool: interactive test tool\n"
-"Copyright (C) 2009 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"
+"%s: root device not found: only call this function with a root device "
+"previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: test-tool/test-tool.c:138
+#: src/inspect_fs.c:346 src/inspect_fs.c:359
 #, c-format
-msgid "libguestfs-test-tool: unknown long option: %s (%d)\n"
+msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: test-tool/test-tool.c:147
+#: src/inspect_fs.c:512
 #, c-format
-msgid "libguestfs-test-tool: invalid timeout: %s\n"
+msgid "%s: file is empty"
 msgstr ""
 
-#: test-tool/test-tool.c:159
-#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#: src/inspect_fs_unix.c:771
+msgid "could not parse /etc/fstab or empty file"
 msgstr ""
 
-#: test-tool/test-tool.c:182
+#: src/inspect_fs_windows.c:164
 #, c-format
-msgid "libguestfs-test-tool: failed to create libguestfs handle\n"
+msgid "cannot resolve Windows %%SYSTEMROOT%%"
 msgstr ""
 
-#: test-tool/test-tool.c:187 test-tool/test-tool.c:193
+#: src/inspect_icon.c:492
 #, c-format
-msgid "libguestfs-test-tool: failed to add drive '%s'\n"
+msgid "read: %s: unexpected end of file"
 msgstr ""
 
-#: test-tool/test-tool.c:201
-#, c-format
-msgid "libguestfs-test-tool: guestfs_version failed\n"
+#: src/launch.c:134
+msgid "command line cannot be altered after qemu subprocess launched"
 msgstr ""
 
-#: test-tool/test-tool.c:223
-#, c-format
-msgid "libguestfs-test-tool: failed to launch appliance\n"
+#: src/launch.c:203
+msgid "guestfs_config: parameter must begin with '-' character"
 msgstr ""
 
-#: test-tool/test-tool.c:235
+#: src/launch.c:217
 #, c-format
-msgid "libguestfs-test-tool: failed to run sfdisk\n"
+msgid "guestfs_config: parameter '%s' isn't allowed"
 msgstr ""
 
-#: test-tool/test-tool.c:241
-#, c-format
-msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
+#: src/launch.c:289 src/launch.c:407
+msgid "filename cannot contain ',' (comma) character"
 msgstr ""
 
-#: test-tool/test-tool.c:247
+#: src/launch.c:303 src/launch.c:311
 #, c-format
-msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
+msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: test-tool/test-tool.c:253
-#, c-format
-msgid "libguestfs-test-tool: failed to mkdir /iso\n"
+#: src/launch.c:426
+msgid "the libguestfs handle has already been launched"
 msgstr ""
 
-#: test-tool/test-tool.c:259
+#: src/launch.c:437
 #, c-format
-msgid "libguestfs-test-tool: failed to mount /dev/sdb on /iso\n"
+msgid "%s: cannot create temporary directory"
 msgstr ""
 
-#: test-tool/test-tool.c:267
-#, c-format
-msgid "libguestfs-test-tool: could not run helper program, or helper failed\n"
+#: src/launch.c:474
+msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: test-tool/test-tool.c:298
-#, c-format
-msgid ""
-"LIBGUESTFS_QEMU environment variable is already set, so\n"
-"--qemu/--qemudir options cannot be used.\n"
+#: src/launch.c:895
+msgid "guestfs_launch failed, see earlier error messages"
 msgstr ""
 
-#: test-tool/test-tool.c:306
-#, c-format
-msgid "Binary '%s' does not exist or is not executable\n"
+#: src/launch.c:908
+msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: test-tool/test-tool.c:320
-#, c-format
-msgid "%s: does not look like a qemu source directory\n"
+#: src/launch.c:998
+msgid "guestfs_launch failed, unexpected initial message from guestfsd"
+msgstr ""
+
+#: src/launch.c:1006
+msgid "contacted guestfsd, but state != READY"
 msgstr ""
 
-#: test-tool/test-tool.c:369
+#: src/launch.c:1178
 #, c-format
 msgid ""
-"Test tool helper program 'libguestfs-test-tool-helper' is not\n"
-"available.  Expected to find it in '%s'\n"
+"command failed: %s\n"
 "\n"
-"Use the --helper option to specify the location of this program.\n"
+"If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\n"
+"environment variable.  There may also be errors printed above."
 msgstr ""
 
-#: test-tool/test-tool.c:385
-#, c-format
-msgid "command failed: %s"
+#: src/launch.c:1318
+msgid "qemu has not been launched yet"
 msgstr ""
 
-#: test-tool/test-tool.c:393
-#, 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"
+#: src/launch.c:1329
+msgid "no subprocess to kill"
 msgstr ""
 
-#: test-tool/test-tool.c:427
+#: src/proto.c:188
 #, c-format
-msgid "mkisofs command failed: %s\n"
+msgid "guestfs_set_busy: called when in state %d != READY"
 msgstr ""
 
-#: tools/virt-cat.pl:128
-msgid "virt-cat: no image, VM names or filenames to cat given"
+#: src/proto.c:211
+#, c-format
+msgid "guestfs_end_busy: called when in state %d"
 msgstr ""
 
-#: tools/virt-cat.pl:153
-msgid "multiboot operating systems are not supported by virt-cat"
+#: src/proto.c:421
+#, c-format
+msgid ""
+"check_for_daemon_cancellation_or_eof: read 0x%x from daemon, expected 0x%x\n"
 msgstr ""
 
-#: tools/virt-df.pl:180
-msgid "virt-df: cannot use -h and --csv options together\n"
+#: 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 ""
 
-#: tools/virt-df.pl:243
-#, perl-brace-format
-msgid "{name} is not the name of a libvirt domain\n"
+#: src/proto.c:549
+msgid "See earlier debug messages.\n"
 msgstr ""
 
-#: tools/virt-df.pl:292
-#, perl-brace-format
-msgid "virt-df: ignoring {name}, it has too many disks ({c} > {max})"
+#: src/proto.c:639
+#, c-format
+msgid "received magic signature from guestfsd, but in state %d"
 msgstr ""
 
-#: tools/virt-df.pl:454
-msgid "Virtual Machine"
+#: src/proto.c:658
+#, c-format
+msgid "message length (%u) > maximum possible size (%d)"
 msgstr ""
 
-#: tools/virt-df.pl:454
-msgid "Filesystem"
+#: src/proto.c:810
+#, c-format
+msgid "guestfs___send: state %d != BUSY"
 msgstr ""
 
-#: tools/virt-df.pl:457
-msgid "1K-blocks"
+#: src/proto.c:834
+msgid "xdr_guestfs_message_header failed"
 msgstr ""
 
-#: tools/virt-df.pl:459
-msgid "Size"
+#: src/proto.c:843
+msgid "dispatch failed to marshal args"
 msgstr ""
 
-#: tools/virt-df.pl:461
-msgid "Used"
+#: src/proto.c:922 src/proto.c:1218
+msgid "operation cancelled by user"
 msgstr ""
 
-#: tools/virt-df.pl:462
-msgid "Available"
+#: src/proto.c:973
+#, c-format
+msgid "send_file_chunk: state %d != READY"
 msgstr ""
 
-#: tools/virt-df.pl:463
-msgid "Use%"
+#: src/proto.c:989
+#, c-format
+msgid "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"
 msgstr ""
 
-#: tools/virt-df.pl:465
-msgid "Inodes"
+#: src/proto.c:1145
+#, c-format
+msgid "%s: error in chunked encoding"
 msgstr ""
 
-#: tools/virt-df.pl:466
-msgid "IUsed"
+#: src/proto.c:1172
+msgid "write to daemon socket"
 msgstr ""
 
-#: tools/virt-df.pl:467
-msgid "IFree"
+#: src/proto.c:1195
+msgid "receive_file_data: parse error in reply callback"
 msgstr ""
 
-#: tools/virt-df.pl:468
-msgid "IUse%"
+#: src/proto.c:1200
+msgid "receive_file_data: unexpected flag received when reading file chunks"
 msgstr ""
 
-#: tools/virt-edit.pl:152
-msgid "virt-edit: no image, VM names or filenames to edit given"
+#: src/proto.c:1208
+msgid "failed to parse file chunk"
 msgstr ""
 
-#: tools/virt-edit.pl:177
-msgid "multiboot operating systems are not supported by virt-edit"
+#: src/proto.c:1222
+msgid "file receive cancelled by daemon"
 msgstr ""
 
-#: tools/virt-edit.pl:203
-msgid "File not changed.\n"
+#: src/virt.c:106 src/virt.c:400
+msgid "you cannot set both live and readonly flags"
 msgstr ""
 
-#: tools/virt-list-filesystems.pl:121
-msgid "virt-list-filesystems: no image or VM name given"
+#: src/virt.c:114
+#, c-format
+msgid "could not connect to libvirt (code %d, domain %d): %s"
 msgstr ""
 
-#: tools/virt-list-partitions.pl:131
-msgid "virt-list-partitions: no image or VM name given"
+#: src/virt.c:135
+#, c-format
+msgid "no libvirt domain called '%s': %s"
 msgstr ""
 
-#: tools/virt-ls.pl:137 tools/virt-ls.pl:143
-msgid "virt-ls: cannot combine -l and -R options\n"
+#: src/virt.c:195 src/virt.c:523
+#, c-format
+msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: tools/virt-ls.pl:161
-msgid "virt-ls: no image, VM names or directory to list given"
+#: src/virt.c:205 src/virt.c:531
+msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: tools/virt-ls.pl:186
-msgid "multiboot operating systems are not supported by virt-ls\n"
+#: src/virt.c:211 src/virt.c:537
+msgid "unable to create new XPath context"
 msgstr ""
 
-#: tools/virt-make-fs.pl:291
-msgid "virt-make-fs input output\n"
+#: src/virt.c:218 src/virt.c:552
+msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: tools/virt-make-fs.pl:321
-msgid "unexpected output from 'du' command"
+#: src/virt.c:327
+msgid "libvirt domain has no disks"
 msgstr ""
 
-#: tools/virt-make-fs.pl:333 tools/virt-make-fs.pl:347
-#: tools/virt-make-fs.pl:453
-#, perl-brace-format
-msgid "{f}: unknown input format: {fmt}\n"
+#: src/virt.c:394
+msgid "unknown readonlydisk parameter"
 msgstr ""
 
-#: tools/virt-make-fs.pl:391
-#, perl-brace-format
-msgid "virt-make-fs: cannot parse size parameter: {sz}\n"
+#: src/virt.c:411
+#, c-format
+msgid "error getting domain info: %s"
 msgstr ""
 
-#: tools/virt-make-fs.pl:401
+#: src/virt.c:425
 msgid ""
-"qemu-img create: failed to create disk image, see earlier error messages\n"
-msgstr ""
-
-#: tools/virt-make-fs.pl:412
-msgid "virt-make-fs: NTFS support was disabled when libguestfs was compiled\n"
-msgstr ""
-
-#: tools/virt-make-fs.pl:437
-msgid "tar: failed, see earlier messages\n"
-msgstr ""
-
-#: tools/virt-make-fs.pl:459
-msgid "uncompress command failed, see earlier messages\n"
+"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 ""
 
-#: tools/virt-make-fs.pl:494
+#: src/virt.c:490
+#, c-format
 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:195
-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"
+"%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
+"\"error\""
 msgstr ""
 
-#: tools/virt-resize.pl:528
-#, perl-brace-format
-msgid "virt-resize: {file}: does not exist or is not readable\n"
+#: src/virt.c:580
+msgid ""
+"this guest has no libvirt <channel> definition for guestfsd\n"
+"See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: tools/virt-resize.pl:530
-#, perl-brace-format
+#: src/virt.c:605
 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"
+"add-domain API not available since this version of libguestfs was compiled "
+"without libvirt or libxml2"
 msgstr ""
 
-#: tools/virt-resize.pl:555 tools/virt-resize.pl:558
-#, perl-brace-format
+#: test-tool/test-tool.c:79
+#, c-format
 msgid ""
-"virt-resize: {file}: file is too small to be a disk image ({sz} bytes)\n"
+"libguestfs-test-tool: interactive test tool\n"
+"Copyright (C) 2009-2011 Red Hat Inc.\n"
+"Usage:\n"
+"  libguestfs-test-tool [--options]\n"
+"Options:\n"
+"  --help         Display usage\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 ""
 
-#: tools/virt-resize.pl:723
-#, perl-brace-format
-msgid "virt-resize: no logical volume called {n}\n"
+#: test-tool/test-tool.c:128
+#, c-format
+msgid "libguestfs-test-tool: unknown long option: %s (%d)\n"
 msgstr ""
 
-#: tools/virt-resize.pl:743
-#, perl-brace-format
-msgid ""
-"{p}: partition not found in the source disk image, when using the '{opt}' "
-"command line option\n"
+#: test-tool/test-tool.c:137
+#, c-format
+msgid "libguestfs-test-tool: invalid timeout: %s\n"
 msgstr ""
 
-#: tools/virt-resize.pl:749
-#, perl-brace-format
-msgid ""
-"{p}: partition ignored, you cannot use it in another command line argument\n"
+#: test-tool/test-tool.c:149
+#, c-format
+msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
 msgstr ""
 
-#: tools/virt-resize.pl:753
-#, perl-brace-format
-msgid ""
-"{p}: partition deleted, you cannot use it in another command line argument\n"
+#: test-tool/test-tool.c:175
+#, c-format
+msgid "libguestfs-test-tool: failed to create libguestfs handle\n"
 msgstr ""
 
-#: tools/virt-resize.pl:795
-#, perl-brace-format
-msgid "{p}: this partition has already been marked for resizing\n"
+#: test-tool/test-tool.c:182
+#, c-format
+msgid "libguestfs-test-tool: failed to add drive '%s'\n"
 msgstr ""
 
-#: tools/virt-resize.pl:803
-#, perl-brace-format
-msgid "{p}: missing size field in {o} option\n"
+#: test-tool/test-tool.c:190
+#, c-format
+msgid "libguestfs-test-tool: guestfs_version failed\n"
 msgstr ""
 
-#: tools/virt-resize.pl:820
-#, perl-brace-format
-msgid "{p}: {f}: cannot parse size field\n"
+#: test-tool/test-tool.c:224
+#, c-format
+msgid "libguestfs-test-tool: failed to launch appliance\n"
 msgstr ""
 
-#: tools/virt-resize.pl:825
-#, perl-brace-format
-msgid "{p}: new size is zero or negative\n"
+#: test-tool/test-tool.c:236
+#, c-format
+msgid "libguestfs-test-tool: failed to run part-disk\n"
 msgstr ""
 
-#: tools/virt-resize.pl:848
-#, 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"
+#: test-tool/test-tool.c:242
+#, c-format
+msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
 msgstr ""
 
-#: tools/virt-resize.pl:864
-msgid "virt-resize: you cannot use options --expand and --shrink together\n"
+#: test-tool/test-tool.c:248
+#, c-format
+msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
 msgstr ""
 
-#: tools/virt-resize.pl:913
-#, 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"
+#: test-tool/test-tool.c:255
+#, c-format
+msgid "libguestfs-test-tool: failed to touch file\n"
 msgstr ""
 
-#: tools/virt-resize.pl:928
+#: test-tool/test-tool.c:289
+#, c-format
 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:943
-msgid "Summary of changes:\n"
+"LIBGUESTFS_QEMU environment variable is already set, so\n"
+"--qemu/--qemudir options cannot be used.\n"
 msgstr ""
 
-#: tools/virt-resize.pl:947
-#, perl-brace-format
-msgid "{p}: partition will be ignored\n"
+#: test-tool/test-tool.c:297
+#, c-format
+msgid "Binary '%s' does not exist or is not executable\n"
 msgstr ""
 
-#: tools/virt-resize.pl:949
-#, perl-brace-format
-msgid "{p}: partition will be deleted\n"
+#: test-tool/test-tool.c:311
+#, c-format
+msgid "%s: does not look like a qemu source directory\n"
 msgstr ""
 
-#: tools/virt-resize.pl:951
-#, perl-brace-format
-msgid "{p}: partition will be resized from {oldsize} to {newsize}\n"
+#: tools/virt-list-filesystems.pl:148
+msgid "virt-list-filesystems: no image or VM name given"
 msgstr ""
 
-#: tools/virt-resize.pl:956
-#, perl-brace-format
-msgid "{p}: content will be expanded using the '{meth}' method\n"
+#: tools/virt-list-partitions.pl:160
+msgid "virt-list-partitions: no image or VM name given"
 msgstr ""
 
-#: tools/virt-resize.pl:961
-#, perl-brace-format
-msgid "{p}: partition will be left alone\n"
+#: tools/virt-make-fs.pl:293
+msgid "virt-make-fs input output\n"
 msgstr ""
 
-#: tools/virt-resize.pl:966
-#, perl-brace-format
-msgid "{n}: LV will be expanded to maximum size\n"
+#: tools/virt-make-fs.pl:323
+msgid "unexpected output from 'du' command"
 msgstr ""
 
-#: tools/virt-resize.pl:972
+#: tools/virt-make-fs.pl:335 tools/virt-make-fs.pl:349
+#: tools/virt-make-fs.pl:476
 #, perl-brace-format
-msgid "{n}: content will be expanded using the '{meth}' method\n"
+msgid "{f}: unknown input format: {fmt}\n"
 msgstr ""
 
-#: tools/virt-resize.pl:979
+#: tools/virt-make-fs.pl:393
 #, perl-brace-format
-msgid "There is a surplus of {spl} bytes ({h}).\n"
-msgstr ""
-
-#: tools/virt-resize.pl:984
-msgid "An extra partition will be created for the surplus.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:986
-msgid ""
-"The surplus space is not large enough for an extra partition to be created\n"
-"and so it will just be ignored.\n"
+msgid "virt-make-fs: cannot parse size parameter: {sz}\n"
 msgstr ""
 
-#: tools/virt-resize.pl:989
+#: tools/virt-make-fs.pl:408
 msgid ""
-"The surplus space will be ignored.  Run a partitioning program in the guest\n"
-"to partition this extra space if you want.\n"
+"qemu-img create: failed to create disk image, see earlier error messages\n"
 msgstr ""
 
-#: tools/virt-resize.pl:992
-#, 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"
+#: tools/virt-make-fs.pl:419
+msgid "virt-make-fs: NTFS support was disabled when libguestfs was compiled\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1033
-msgid "virt-resize: source disk does not have a first partition\n"
+#: tools/virt-make-fs.pl:460
+msgid "tar: failed, see earlier messages\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1128
-#, perl-brace-format
-msgid "Copying {p} ...\n"
+#: tools/virt-make-fs.pl:482
+msgid "uncompress command failed, see earlier messages\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1189 tools/virt-resize.pl:1247
-#, perl-brace-format
-msgid "Expanding {p} using the '{meth}' method\n"
+#: tools/virt-make-fs.pl:517
+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-tar.pl:162 tools/virt-tar.pl:169
+#: tools/virt-tar.pl:193 tools/virt-tar.pl:200
 msgid "virt-tar: extract/upload mode specified twice on the command line\n"
 msgstr ""
 
-#: tools/virt-tar.pl:190
+#: tools/virt-tar.pl:222
 msgid "virt-tar: no image, VM names, directory or filename given"
 msgstr ""
 
-#: tools/virt-tar.pl:193
+#: tools/virt-tar.pl:225
 msgid "virt-tar: either -x or -u must be specified on the command line\n"
 msgstr ""
 
-#: tools/virt-tar.pl:204
+#: tools/virt-tar.pl:236
 #, perl-brace-format
 msgid "virt-tar: {tarball}: file not found\n"
 msgstr ""
 
-#: tools/virt-tar.pl:207
+#: tools/virt-tar.pl:239
 #, perl-brace-format
 msgid "virt-tar: {dir}: directory name must start with '/' character\n"
 msgstr ""
 
-#: tools/virt-tar.pl:229
-msgid "multiboot operating systems are not supported by virt-tar\n"
+#: tools/virt-tar.pl:253 tools/virt-win-reg.pl:261
+#, 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:259
-msgid "no libvirt domain name or disk image given\n"
+#: tools/virt-tar.pl:257 tools/virt-win-reg.pl:265
+#, perl-brace-format
+msgid "{prog}: multiboot operating systems are not supported.\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:283
-msgid "multiboot operating systems are not supported by virt-win-reg"
+#: tools/virt-win-reg.pl:245
+msgid "no libvirt domain name or disk image given\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:297
+#: tools/virt-win-reg.pl:287
 msgid ""
 "expecting 1 or 2 more parameters, subkey path and optionally the value to "
 "export\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:408
+#: tools/virt-win-reg.pl:446
+#, perl-brace-format
+msgid "virt-win-reg: {p}: cannot find user directory\n"
+msgstr ""
+
+#: tools/virt-win-reg.pl:451
 #, perl-brace-format
 msgid "virt-win-reg: {p}: not a supported Windows Registry path\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:426 tools/virt-win-reg.pl:449
+#: tools/virt-win-reg.pl:522 tools/virt-win-reg.pl:544
 #, perl-brace-format
 msgid "virt-win-reg: {p}: file not found in guest: {err}\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:433
+#: tools/virt-win-reg.pl:529
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not download registry file: {err}\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:456
+#: tools/virt-win-reg.pl:551
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""