X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=po%2Flibguestfs.pot;h=96c14182ed95ee1b5968cddc5f4c1ef995dad064;hb=be1419a442d9936e737fb2ca6f0fdba36a048964;hp=ff13fedb43b567c1a5b2e3d434bfe40dfc1dc4f3;hpb=4c5ca903b52ccc785a3d879da8506be248b0d6f7;p=libguestfs.git

diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index ff13fed..cc8d489 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.5.25\n"
+"Project-Id-Version: libguestfs 1.15.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2010-10-28 18:07+0100\n"
+"POT-Creation-Date: 2011-12-22 16:09+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:223 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:280
+#: 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:1558
+#, 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"
@@ -38,1570 +354,1833 @@ msgstr ""
 msgid "%s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2788
 msgid "Command"
 msgstr ""
 
-#: fish/cmds.c:41
+#: fish/cmds.c:2788
 msgid "Description"
 msgstr ""
 
-#: fish/cmds.c:43 fish/cmds.c:475
+#: fish/cmds.c:2790
 msgid "add a CD-ROM disk image to examine"
 msgstr ""
 
-#: fish/cmds.c:44 fish/cmds.c:45 fish/cmds.c:470 fish/cmds.c:700
+#: fish/cmds.c:2791
+msgid "add the disk(s) from a named libvirt domain"
+msgstr ""
+
+#: fish/cmds.c:2792 fish/cmds.c:2793
 msgid "add an image to examine or modify"
 msgstr ""
 
-#: fish/cmds.c:46 fish/cmds.c:480
+#: fish/cmds.c:2794
 msgid "add a drive in snapshot mode (read-only)"
 msgstr ""
 
-#: fish/cmds.c:47 fish/cmds.c:630
+#: fish/cmds.c:2795
 msgid "add a drive read-only specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:48 fish/cmds.c:625
+#: fish/cmds.c:2796
 msgid "add a drive specifying the QEMU block emulation to use"
 msgstr ""
 
-#: fish/cmds.c:49 fish/cmds.c:390
+#: fish/cmds.c:2797
 msgid "allocate and add a disk file"
 msgstr ""
 
-#: fish/cmds.c:50 fish/cmds.c:1900
+#: fish/cmds.c:2798
 msgid "clear Augeas path"
 msgstr ""
 
-#: fish/cmds.c:51 fish/cmds.c:790
+#: fish/cmds.c:2799
 msgid "close the current Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:52 fish/cmds.c:800
+#: fish/cmds.c:2800
 msgid "define an Augeas node"
 msgstr ""
 
-#: fish/cmds.c:53 fish/cmds.c:795
+#: fish/cmds.c:2801
 msgid "define an Augeas variable"
 msgstr ""
 
-#: fish/cmds.c:54 fish/cmds.c:805
+#: fish/cmds.c:2802
 msgid "look up the value of an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:55 fish/cmds.c:785
+#: fish/cmds.c:2803
 msgid "create a new Augeas handle"
 msgstr ""
 
-#: fish/cmds.c:56 fish/cmds.c:815
+#: fish/cmds.c:2804
 msgid "insert a sibling Augeas node"
 msgstr ""
 
-#: fish/cmds.c:57 fish/cmds.c:840
+#: fish/cmds.c:2805
 msgid "load files into the tree"
 msgstr ""
 
-#: fish/cmds.c:58 fish/cmds.c:845
+#: fish/cmds.c:2806
 msgid "list Augeas nodes under augpath"
 msgstr ""
 
-#: fish/cmds.c:59 fish/cmds.c:830
+#: fish/cmds.c:2807
 msgid "return Augeas nodes which match augpath"
 msgstr ""
 
-#: fish/cmds.c:60 fish/cmds.c:825
+#: fish/cmds.c:2808
 msgid "move Augeas node"
 msgstr ""
 
-#: fish/cmds.c:61 fish/cmds.c:820
+#: fish/cmds.c:2809
 msgid "remove an Augeas path"
 msgstr ""
 
-#: fish/cmds.c:62 fish/cmds.c:835
+#: fish/cmds.c:2810
 msgid "write all pending Augeas changes to disk"
 msgstr ""
 
-#: fish/cmds.c:63 fish/cmds.c:810
+#: fish/cmds.c:2811
 msgid "set Augeas path to value"
 msgstr ""
 
-#: fish/cmds.c:64 fish/cmds.c:1785
+#: fish/cmds.c:2812
 msgid "test availability of some parts of the API"
 msgstr ""
 
-#: fish/cmds.c:65 fish/cmds.c:1960
+#: fish/cmds.c:2813
 msgid "return a list of all optional groups"
 msgstr ""
 
-#: fish/cmds.c:66 fish/cmds.c:1915
+#: fish/cmds.c:2814
 msgid "upload base64-encoded data to file"
 msgstr ""
 
-#: fish/cmds.c:67 fish/cmds.c:1920
+#: fish/cmds.c:2815
 msgid "download file and encode as base64"
 msgstr ""
 
-#: fish/cmds.c:68 fish/cmds.c:1025
+#: fish/cmds.c:2816
+msgid "print block device attributes"
+msgstr ""
+
+#: fish/cmds.c:2817
 msgid "flush device buffers"
 msgstr ""
 
-#: fish/cmds.c:69 fish/cmds.c:1005
+#: fish/cmds.c:2818
 msgid "get blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:70 fish/cmds.c:995
+#: fish/cmds.c:2819
 msgid "is block device set to read-only"
 msgstr ""
 
-#: fish/cmds.c:71 fish/cmds.c:1020
+#: fish/cmds.c:2820
 msgid "get total size of device in bytes"
 msgstr ""
 
-#: fish/cmds.c:72 fish/cmds.c:1000
+#: fish/cmds.c:2821
 msgid "get sectorsize of block device"
 msgstr ""
 
-#: fish/cmds.c:73 fish/cmds.c:1015
+#: fish/cmds.c:2822
 msgid "get total size of device in 512-byte sectors"
 msgstr ""
 
-#: fish/cmds.c:74 fish/cmds.c:1030
+#: fish/cmds.c:2823
 msgid "reread partition table"
 msgstr ""
 
-#: fish/cmds.c:75 fish/cmds.c:1010
+#: fish/cmds.c:2824
 msgid "set blocksize of block device"
 msgstr ""
 
-#: fish/cmds.c:76 fish/cmds.c:985
+#: fish/cmds.c:2825
 msgid "set block device to read-only"
 msgstr ""
 
-#: fish/cmds.c:77 fish/cmds.c:990
+#: fish/cmds.c:2826
 msgid "set block device to read-write"
 msgstr ""
 
-#: fish/cmds.c:78 fish/cmds.c:1690
+#: fish/cmds.c:2827
+msgid "resize a btrfs filesystem"
+msgstr ""
+
+#: fish/cmds.c:2828
 msgid "return true path on case-insensitive filesystem"
 msgstr ""
 
-#: fish/cmds.c:79 fish/cmds.c:725
+#: fish/cmds.c:2829
 msgid "list the contents of a file"
 msgstr ""
 
-#: fish/cmds.c:80 fish/cmds.c:1045
+#: fish/cmds.c:2830
 msgid "compute MD5, SHAx or CRC checksum of file"
 msgstr ""
 
-#: fish/cmds.c:81 fish/cmds.c:1890
+#: fish/cmds.c:2831
 msgid "compute MD5, SHAx or CRC checksum of the contents of a device"
 msgstr ""
 
-#: fish/cmds.c:82 fish/cmds.c:1925
+#: fish/cmds.c:2832
 msgid "compute MD5, SHAx or CRC checksum of files in a directory"
 msgstr ""
 
-#: fish/cmds.c:83 fish/cmds.c:875
+#: fish/cmds.c:2833
 msgid "change file mode"
 msgstr ""
 
-#: fish/cmds.c:84 fish/cmds.c:185 fish/cmds.c:880 fish/cmds.c:1720
+#: fish/cmds.c:2834 fish/cmds.c:2965
 msgid "change file owner and group"
 msgstr ""
 
-#: fish/cmds.c:85 fish/cmds.c:955
+#: fish/cmds.c:2835
 msgid "run a command from the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:86 fish/cmds.c:960
+#: fish/cmds.c:2836
 msgid "run a command, returning lines"
 msgstr ""
 
-#: fish/cmds.c:87 fish/cmds.c:485
+#: fish/cmds.c:2837
+msgid "output compressed device"
+msgstr ""
+
+#: fish/cmds.c:2838
+msgid "output compressed file"
+msgstr ""
+
+#: fish/cmds.c:2839
 msgid "add qemu parameters"
 msgstr ""
 
-#: fish/cmds.c:88 fish/cmds.c:395
+#: fish/cmds.c:2840
+msgid "copy from source device to destination device"
+msgstr ""
+
+#: fish/cmds.c:2841
+msgid "copy from source device to destination file"
+msgstr ""
+
+#: fish/cmds.c:2842
+msgid "copy from source file to destination device"
+msgstr ""
+
+#: fish/cmds.c:2843
+msgid "copy from source file to destination file"
+msgstr ""
+
+#: fish/cmds.c:2844
 msgid "copy local files or directories into an image"
 msgstr ""
 
-#: fish/cmds.c:89 fish/cmds.c:400
+#: fish/cmds.c:2845
 msgid "copy remote files or directories out of an image"
 msgstr ""
 
-#: fish/cmds.c:90 fish/cmds.c:1840
+#: fish/cmds.c:2846
 msgid "copy size bytes from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:91 fish/cmds.c:1140
+#: fish/cmds.c:2847
 msgid "copy a file"
 msgstr ""
 
-#: fish/cmds.c:92 fish/cmds.c:1145
+#: fish/cmds.c:2848
 msgid "copy a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:93 fish/cmds.c:1790
+#: fish/cmds.c:2849
 msgid "copy from source to destination using dd"
 msgstr ""
 
-#: fish/cmds.c:94 fish/cmds.c:1085
+#: fish/cmds.c:2850
 msgid "debugging and internals"
 msgstr ""
 
-#: fish/cmds.c:95 fish/cmds.c:1910
+#: fish/cmds.c:2851
+msgid "debug the QEMU command line (internal use only)"
+msgstr ""
+
+#: fish/cmds.c:2852
+msgid "debug the drives (internal use only)"
+msgstr ""
+
+#: fish/cmds.c:2853
 msgid "upload a file to the appliance (internal use only)"
 msgstr ""
 
-#: fish/cmds.c:96 fish/cmds.c:1330
+#: fish/cmds.c:2854
+msgid "delete a previously registered event handler"
+msgstr ""
+
+#: fish/cmds.c:2855
 msgid "report file system disk space usage"
 msgstr ""
 
-#: fish/cmds.c:97 fish/cmds.c:1335
+#: fish/cmds.c:2856
 msgid "report file system disk space usage (human readable)"
 msgstr ""
 
-#: fish/cmds.c:98 fish/cmds.c:1160
+#: fish/cmds.c:2857
+msgid "display an image"
+msgstr ""
+
+#: fish/cmds.c:2858
 msgid "return kernel messages"
 msgstr ""
 
-#: fish/cmds.c:99 fish/cmds.c:1040
+#: fish/cmds.c:2859
 msgid "download a file to the local machine"
 msgstr ""
 
-#: fish/cmds.c:100 fish/cmds.c:2075
+#: fish/cmds.c:2860
 msgid "download a file to the local machine with offset and size"
 msgstr ""
 
-#: fish/cmds.c:101 fish/cmds.c:1155
+#: fish/cmds.c:2861
 msgid "drop kernel page cache, dentries and inodes"
 msgstr ""
 
-#: fish/cmds.c:102 fish/cmds.c:1340
+#: fish/cmds.c:2862
 msgid "estimate file space usage"
 msgstr ""
 
-#: fish/cmds.c:103 fish/cmds.c:1245
+#: fish/cmds.c:2863
 msgid "check an ext2/ext3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:104 fish/cmds.c:405
+#: fish/cmds.c:2864
 msgid "display a line of text"
 msgstr ""
 
-#: fish/cmds.c:105 fish/cmds.c:1680
+#: fish/cmds.c:2865
 msgid "echo arguments back to the client"
 msgstr ""
 
-#: fish/cmds.c:106 fish/cmds.c:410
+#: fish/cmds.c:2866
 msgid "edit a file"
 msgstr ""
 
-#: fish/cmds.c:107 fish/cmds.c:108 fish/cmds.c:113 fish/cmds.c:114
-#: fish/cmds.c:145 fish/cmds.c:146 fish/cmds.c:374 fish/cmds.c:375
-#: fish/cmds.c:379 fish/cmds.c:380 fish/cmds.c:382 fish/cmds.c:383
-#: fish/cmds.c:1460 fish/cmds.c:1465 fish/cmds.c:1470 fish/cmds.c:1475
-#: fish/cmds.c:1480 fish/cmds.c:1485 fish/cmds.c:1490 fish/cmds.c:1495
-#: fish/cmds.c:1500 fish/cmds.c:1505 fish/cmds.c:1510 fish/cmds.c:1515
+#: fish/cmds.c:2867 fish/cmds.c:2868 fish/cmds.c:2874 fish/cmds.c:2875
+#: fish/cmds.c:2910 fish/cmds.c:2911 fish/cmds.c:3174 fish/cmds.c:3175
+#: fish/cmds.c:3179 fish/cmds.c:3180 fish/cmds.c:3182 fish/cmds.c:3183
 msgid "return lines matching a pattern"
 msgstr ""
 
-#: fish/cmds.c:109 fish/cmds.c:1170
+#: fish/cmds.c:2869
 msgid "test if two files have equal contents"
 msgstr ""
 
-#: fish/cmds.c:110 fish/cmds.c:885
+#: fish/cmds.c:2870
+msgid "register a handler for an event or events"
+msgstr ""
+
+#: fish/cmds.c:2871
 msgid "test if file or directory exists"
 msgstr ""
 
-#: fish/cmds.c:111 fish/cmds.c:112 fish/cmds.c:1550 fish/cmds.c:1965
+#: fish/cmds.c:2872 fish/cmds.c:2873
 msgid "preallocate a file in the guest filesystem"
 msgstr ""
 
-#: fish/cmds.c:115 fish/cmds.c:950
+#: fish/cmds.c:2876
 msgid "determine file type"
 msgstr ""
 
-#: fish/cmds.c:116 fish/cmds.c:635
+#: fish/cmds.c:2877
 msgid "detect the architecture of a binary file"
 msgstr ""
 
-#: fish/cmds.c:117 fish/cmds.c:1795
+#: fish/cmds.c:2878
 msgid "return the size of the file in bytes"
 msgstr ""
 
-#: fish/cmds.c:118 fish/cmds.c:1780
+#: fish/cmds.c:2879
 msgid "fill a file with octets"
 msgstr ""
 
-#: fish/cmds.c:119 fish/cmds.c:1930
+#: fish/cmds.c:2880
 msgid "fill a file with a repeating pattern of bytes"
 msgstr ""
 
-#: fish/cmds.c:120 fish/cmds.c:1240
+#: fish/cmds.c:2881
 msgid "find all files and directories"
 msgstr ""
 
-#: fish/cmds.c:121 fish/cmds.c:1685
+#: fish/cmds.c:2882
 msgid "find all files and directories, returning NUL-separated list"
 msgstr ""
 
-#: fish/cmds.c:122 fish/cmds.c:2035
+#: fish/cmds.c:2883
 msgid "find a filesystem by label"
 msgstr ""
 
-#: fish/cmds.c:123 fish/cmds.c:2030
+#: fish/cmds.c:2884
 msgid "find a filesystem by UUID"
 msgstr ""
 
-#: fish/cmds.c:124 fish/cmds.c:1125
+#: fish/cmds.c:2885
 msgid "run the filesystem checker"
 msgstr ""
 
-#: fish/cmds.c:125 fish/cmds.c:515
+#: fish/cmds.c:2886
 msgid "get the additional kernel options"
 msgstr ""
 
-#: fish/cmds.c:126 fish/cmds.c:525
+#: fish/cmds.c:2887
+msgid "get the attach method"
+msgstr ""
+
+#: fish/cmds.c:2888
 msgid "get autosync mode"
 msgstr ""
 
-#: fish/cmds.c:127 fish/cmds.c:610
+#: fish/cmds.c:2889
 msgid "get direct appliance mode flag"
 msgstr ""
 
-#: fish/cmds.c:128 fish/cmds.c:1110
+#: fish/cmds.c:2890
 msgid "get the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:129 fish/cmds.c:1120
+#: fish/cmds.c:2891
 msgid "get the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:130 fish/cmds.c:570
+#: fish/cmds.c:2892
 msgid "get memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:131 fish/cmds.c:690
+#: fish/cmds.c:2893
 msgid "get enable network flag"
 msgstr ""
 
-#: fish/cmds.c:132 fish/cmds.c:505
+#: fish/cmds.c:2894
 msgid "get the search path"
 msgstr ""
 
-#: fish/cmds.c:133 fish/cmds.c:575
+#: fish/cmds.c:2895
+msgid "get process group flag"
+msgstr ""
+
+#: fish/cmds.c:2896
 msgid "get PID of qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:134 fish/cmds.c:495
+#: fish/cmds.c:2897
 msgid "get the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:135 fish/cmds.c:620
+#: fish/cmds.c:2898
 msgid "get recovery process enabled flag"
 msgstr ""
 
-#: fish/cmds.c:136 fish/cmds.c:590
+#: fish/cmds.c:2899
 msgid "get SELinux enabled flag"
 msgstr ""
 
-#: fish/cmds.c:137 fish/cmds.c:560
+#: fish/cmds.c:2900
+msgid "get number of virtual CPUs in appliance"
+msgstr ""
+
+#: fish/cmds.c:2901
 msgid "get the current state"
 msgstr ""
 
-#: fish/cmds.c:138 fish/cmds.c:600
+#: fish/cmds.c:2902
 msgid "get command trace enabled flag"
 msgstr ""
 
-#: fish/cmds.c:139 fish/cmds.c:1905
+#: fish/cmds.c:2903
 msgid "get the current umask"
 msgstr ""
 
-#: fish/cmds.c:140 fish/cmds.c:535
+#: fish/cmds.c:2904
 msgid "get verbose mode"
 msgstr ""
 
-#: fish/cmds.c:141 fish/cmds.c:1635
+#: fish/cmds.c:2905
 msgid "get SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:142 fish/cmds.c:186 fish/cmds.c:1410 fish/cmds.c:1415
+#: fish/cmds.c:2906 fish/cmds.c:2966
+msgid "get a single extended attribute"
+msgstr ""
+
+#: fish/cmds.c:2907 fish/cmds.c:2967
 msgid "list extended attributes of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:143 fish/cmds.c:415
+#: fish/cmds.c:2908
 msgid "expand wildcards in command"
 msgstr ""
 
-#: fish/cmds.c:144 fish/cmds.c:1270
+#: fish/cmds.c:2909
 msgid "expand a wildcard path"
 msgstr ""
 
-#: fish/cmds.c:147 fish/cmds.c:1135
-msgid "install GRUB"
+#: fish/cmds.c:2912
+msgid "install GRUB 1"
 msgstr ""
 
-#: fish/cmds.c:148 fish/cmds.c:1310
+#: fish/cmds.c:2913
 msgid "return first 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:149 fish/cmds.c:1315
+#: fish/cmds.c:2914
 msgid "return first N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:150 fish/cmds.c:1185
+#: fish/cmds.c:2915
 msgid "dump a file in hexadecimal"
 msgstr ""
 
-#: fish/cmds.c:151 fish/cmds.c:420
+#: fish/cmds.c:2916
 msgid "edit with a hex editor"
 msgstr ""
 
-#: fish/cmds.c:152 fish/cmds.c:1810
+#: fish/cmds.c:2917
 msgid "list the contents of a single file in an initrd"
 msgstr ""
 
-#: fish/cmds.c:153 fish/cmds.c:1345
+#: fish/cmds.c:2918
 msgid "list files in an initrd"
 msgstr ""
 
-#: fish/cmds.c:154 fish/cmds.c:1605
+#: fish/cmds.c:2919
 msgid "add an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:155 fish/cmds.c:1625
+#: fish/cmds.c:2920
 msgid "close the inotify handle"
 msgstr ""
 
-#: fish/cmds.c:156 fish/cmds.c:1620
+#: fish/cmds.c:2921
 msgid "return list of watched files that had events"
 msgstr ""
 
-#: fish/cmds.c:157 fish/cmds.c:1600
+#: fish/cmds.c:2922
 msgid "create an inotify handle"
 msgstr ""
 
-#: fish/cmds.c:158 fish/cmds.c:1615
+#: fish/cmds.c:2923
 msgid "return list of inotify events"
 msgstr ""
 
-#: fish/cmds.c:159 fish/cmds.c:1610
+#: fish/cmds.c:2924
 msgid "remove an inotify watch"
 msgstr ""
 
-#: fish/cmds.c:160 fish/cmds.c:650
+#: fish/cmds.c:2925
 msgid "get architecture of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:161 fish/cmds.c:655
+#: fish/cmds.c:2926
 msgid "get distro of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:162 fish/cmds.c:680
+#: fish/cmds.c:2927
+msgid "get drive letter mappings"
+msgstr ""
+
+#: fish/cmds.c:2928
 msgid "get filesystems associated with inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:163 fish/cmds.c:660
+#: fish/cmds.c:2929
+msgid "get format of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2930
+msgid "get hostname of the operating system"
+msgstr ""
+
+#: fish/cmds.c:2931
+msgid "get the icon corresponding to this operating system"
+msgstr ""
+
+#: fish/cmds.c:2932
 msgid "get major version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:164 fish/cmds.c:665
+#: fish/cmds.c:2933
 msgid "get minor version of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:165 fish/cmds.c:675
+#: fish/cmds.c:2934
 msgid "get mountpoints of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:166 fish/cmds.c:670
+#: fish/cmds.c:2935
+msgid "get package format used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2936
+msgid "get package management tool used by the operating system"
+msgstr ""
+
+#: fish/cmds.c:2937
 msgid "get product name of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:167 fish/cmds.c:645
+#: fish/cmds.c:2938
+msgid "get product variant of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2939
+msgid "return list of operating systems found by last inspection"
+msgstr ""
+
+#: fish/cmds.c:2940
 msgid "get type of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:168 fish/cmds.c:705
+#: fish/cmds.c:2941
+msgid "get Windows CurrentControlSet of inspected operating system"
+msgstr ""
+
+#: fish/cmds.c:2942
 msgid "get Windows systemroot of inspected operating system"
 msgstr ""
 
-#: fish/cmds.c:169 fish/cmds.c:640
+#: fish/cmds.c:2943
+msgid "get live flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2944
+msgid "get multipart flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2945
+msgid "get netinst (network installer) flag for install disk"
+msgstr ""
+
+#: fish/cmds.c:2946
+msgid "get list of applications installed in the operating system"
+msgstr ""
+
+#: fish/cmds.c:2947
 msgid "inspect disk and return list of operating systems found"
 msgstr ""
 
-#: fish/cmds.c:170 fish/cmds.c:2045
+#: fish/cmds.c:2948
 msgid "test if block device"
 msgstr ""
 
-#: fish/cmds.c:171 fish/cmds.c:555
+#: fish/cmds.c:2949
 msgid "is busy processing a command"
 msgstr ""
 
-#: fish/cmds.c:172 fish/cmds.c:2040
+#: fish/cmds.c:2950
 msgid "test if character device"
 msgstr ""
 
-#: fish/cmds.c:173 fish/cmds.c:545
+#: fish/cmds.c:2951
 msgid "is in configuration state"
 msgstr ""
 
-#: fish/cmds.c:174 fish/cmds.c:895
+#: fish/cmds.c:2952
 msgid "test if a directory"
 msgstr ""
 
-#: fish/cmds.c:175 fish/cmds.c:2050
+#: fish/cmds.c:2953
 msgid "test if FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:176 fish/cmds.c:890
+#: fish/cmds.c:2954
 msgid "test if a regular file"
 msgstr ""
 
-#: fish/cmds.c:177 fish/cmds.c:550
+#: fish/cmds.c:2955
 msgid "is launching subprocess"
 msgstr ""
 
-#: fish/cmds.c:178 fish/cmds.c:2025
+#: fish/cmds.c:2956
 msgid "test if device is a logical volume"
 msgstr ""
 
-#: fish/cmds.c:179 fish/cmds.c:540
+#: fish/cmds.c:2957
 msgid "is ready to accept commands"
 msgstr ""
 
-#: fish/cmds.c:180 fish/cmds.c:2060
+#: fish/cmds.c:2958
 msgid "test if socket"
 msgstr ""
 
-#: fish/cmds.c:181 fish/cmds.c:2055
+#: fish/cmds.c:2959
 msgid "test if symbolic link"
 msgstr ""
 
-#: fish/cmds.c:182 fish/cmds.c:465
+#: fish/cmds.c:2960
+msgid "test if a file contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2961
+msgid "test if a device contains all zero bytes"
+msgstr ""
+
+#: fish/cmds.c:2962
 msgid "kill the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:183 fish/cmds.c:460
+#: fish/cmds.c:2963
 msgid "launch the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:184 fish/cmds.c:425
+#: fish/cmds.c:2964
 msgid "change working directory"
 msgstr ""
 
-#: fish/cmds.c:187 fish/cmds.c:740
+#: fish/cmds.c:2968
+msgid "list 9p filesystems"
+msgstr ""
+
+#: fish/cmds.c:2969
 msgid "list the block devices"
 msgstr ""
 
-#: fish/cmds.c:188 fish/cmds.c:695
+#: fish/cmds.c:2970
+msgid "list device mapper devices"
+msgstr ""
+
+#: fish/cmds.c:2971
+msgid "list event handlers"
+msgstr ""
+
+#: fish/cmds.c:2972
 msgid "list filesystems"
 msgstr ""
 
-#: fish/cmds.c:189 fish/cmds.c:745
+#: fish/cmds.c:2973
+msgid "list Linux md (RAID) devices"
+msgstr ""
+
+#: fish/cmds.c:2974
 msgid "list the partitions"
 msgstr ""
 
-#: fish/cmds.c:190 fish/cmds.c:730
+#: fish/cmds.c:2975
 msgid "list the files in a directory (long format)"
 msgstr ""
 
-#: fish/cmds.c:191 fish/cmds.c:192 fish/cmds.c:1525 fish/cmds.c:1530
+#: fish/cmds.c:2976 fish/cmds.c:2977
 msgid "create a hard link"
 msgstr ""
 
-#: fish/cmds.c:193 fish/cmds.c:194 fish/cmds.c:1535 fish/cmds.c:1540
+#: fish/cmds.c:2978 fish/cmds.c:2979
 msgid "create a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:195 fish/cmds.c:285 fish/cmds.c:1430 fish/cmds.c:1435
+#: fish/cmds.c:2980 fish/cmds.c:3077
 msgid "remove extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:196 fish/cmds.c:735
+#: fish/cmds.c:2981
 msgid "list the files in a directory"
 msgstr ""
 
-#: fish/cmds.c:197 fish/cmds.c:310 fish/cmds.c:1420 fish/cmds.c:1425
+#: fish/cmds.c:2982 fish/cmds.c:3107
 msgid "set extended attribute of a file or directory"
 msgstr ""
 
-#: fish/cmds.c:198 fish/cmds.c:970
+#: fish/cmds.c:2983
 msgid "get file information for a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:199 fish/cmds.c:1725
+#: fish/cmds.c:2984
 msgid "lstat on multiple files"
 msgstr ""
 
-#: fish/cmds.c:200 fish/cmds.c:2015
+#: fish/cmds.c:2985
 msgid "add a key on a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:201 fish/cmds.c:2000
+#: fish/cmds.c:2986
 msgid "close a LUKS device"
 msgstr ""
 
-#: fish/cmds.c:202 fish/cmds.c:203 fish/cmds.c:2005 fish/cmds.c:2010
+#: fish/cmds.c:2987 fish/cmds.c:2988
 msgid "format a block device as a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:204 fish/cmds.c:2020
+#: fish/cmds.c:2989
 msgid "remove a key from a LUKS encrypted device"
 msgstr ""
 
-#: fish/cmds.c:205 fish/cmds.c:1990
+#: fish/cmds.c:2990
 msgid "open a LUKS-encrypted block device"
 msgstr ""
 
-#: fish/cmds.c:206 fish/cmds.c:1995
+#: fish/cmds.c:2991
 msgid "open a LUKS-encrypted block device read-only"
 msgstr ""
 
-#: fish/cmds.c:207 fish/cmds.c:910
+#: fish/cmds.c:2992
 msgid "create an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:208 fish/cmds.c:2090
+#: fish/cmds.c:2993
 msgid "get canonical name of an LV"
 msgstr ""
 
-#: fish/cmds.c:209 fish/cmds.c:1985
+#: fish/cmds.c:2994
 msgid "clear LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:210 fish/cmds.c:945
+#: fish/cmds.c:2995
 msgid "remove all LVM LVs, VGs and PVs"
 msgstr ""
 
-#: fish/cmds.c:211 fish/cmds.c:1980
+#: fish/cmds.c:2996
 msgid "set LVM device filter"
 msgstr ""
 
-#: fish/cmds.c:212 fish/cmds.c:1090
+#: fish/cmds.c:2997
 msgid "remove an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:213 fish/cmds.c:1800
+#: fish/cmds.c:2998
 msgid "rename an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:214 fish/cmds.c:1230
+#: fish/cmds.c:2999
 msgid "resize an LVM logical volume"
 msgstr ""
 
-#: fish/cmds.c:215 fish/cmds.c:1895
+#: fish/cmds.c:3000
 msgid "expand an LV to fill free space"
 msgstr ""
 
-#: fish/cmds.c:216 fish/cmds.c:217 fish/cmds.c:760 fish/cmds.c:775
+#: fish/cmds.c:3001 fish/cmds.c:3002
 msgid "list the LVM logical volumes (LVs)"
 msgstr ""
 
-#: fish/cmds.c:218 fish/cmds.c:1825
+#: fish/cmds.c:3003
 msgid "get the UUID of a logical volume"
 msgstr ""
 
-#: fish/cmds.c:219 fish/cmds.c:1730
+#: fish/cmds.c:3004
 msgid "lgetxattr on multiple files"
 msgstr ""
 
-#: fish/cmds.c:220 fish/cmds.c:430
+#: fish/cmds.c:3005
 msgid "open the manual"
 msgstr ""
 
-#: fish/cmds.c:221 fish/cmds.c:865
-msgid "create a directory"
+#: fish/cmds.c:3006
+msgid "create a Linux md (RAID) device"
 msgstr ""
 
-#: fish/cmds.c:222 fish/cmds.c:1715
-msgid "create a directory with a particular mode"
+#: fish/cmds.c:3007
+msgid "obtain metadata for an MD device"
 msgstr ""
 
-#: fish/cmds.c:223 fish/cmds.c:870
+#: fish/cmds.c:3008
+msgid "stop a Linux md (RAID) device"
+msgstr ""
+
+#: fish/cmds.c:3009
+msgid "create a directory"
+msgstr ""
+
+#: fish/cmds.c:3010
+msgid "create a directory with a particular mode"
+msgstr ""
+
+#: fish/cmds.c:3011
 msgid "create a directory and parents"
 msgstr ""
 
-#: fish/cmds.c:224 fish/cmds.c:1290
+#: fish/cmds.c:3012
 msgid "create a temporary directory"
 msgstr ""
 
-#: fish/cmds.c:225 fish/cmds.c:226 fish/cmds.c:227 fish/cmds.c:1660
-#: fish/cmds.c:1665 fish/cmds.c:1670
+#: fish/cmds.c:3013 fish/cmds.c:3014 fish/cmds.c:3015
 msgid "make ext2/3/4 filesystem with external journal"
 msgstr ""
 
-#: fish/cmds.c:228 fish/cmds.c:1645
+#: fish/cmds.c:3016
 msgid "make ext2/3/4 external journal"
 msgstr ""
 
-#: fish/cmds.c:229 fish/cmds.c:1650
+#: fish/cmds.c:3017
 msgid "make ext2/3/4 external journal with label"
 msgstr ""
 
-#: fish/cmds.c:230 fish/cmds.c:1655
+#: fish/cmds.c:3018
 msgid "make ext2/3/4 external journal with UUID"
 msgstr ""
 
-#: fish/cmds.c:231 fish/cmds.c:1375
+#: fish/cmds.c:3019
 msgid "make FIFO (named pipe)"
 msgstr ""
 
-#: fish/cmds.c:232 fish/cmds.c:915
+#: fish/cmds.c:3020 fish/cmds.c:3022
 msgid "make a filesystem"
 msgstr ""
 
-#: fish/cmds.c:233 fish/cmds.c:1640
+#: fish/cmds.c:3021
 msgid "make a filesystem with block size"
 msgstr ""
 
-#: fish/cmds.c:234 fish/cmds.c:1445
+#: fish/cmds.c:3023
 msgid "create a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:235 fish/cmds.c:1370
+#: fish/cmds.c:3024
 msgid "make block, character or FIFO devices"
 msgstr ""
 
-#: fish/cmds.c:236 fish/cmds.c:1380
+#: fish/cmds.c:3025
 msgid "make block device node"
 msgstr ""
 
-#: fish/cmds.c:237 fish/cmds.c:1385
+#: fish/cmds.c:3026
 msgid "make char device node"
 msgstr ""
 
-#: fish/cmds.c:238 fish/cmds.c:1355
+#: fish/cmds.c:3027
 msgid "create a swap partition"
 msgstr ""
 
-#: fish/cmds.c:239 fish/cmds.c:1360
+#: fish/cmds.c:3028
 msgid "create a swap partition with a label"
 msgstr ""
 
-#: fish/cmds.c:240 fish/cmds.c:1365
+#: fish/cmds.c:3029
 msgid "create a swap partition with an explicit UUID"
 msgstr ""
 
-#: fish/cmds.c:241 fish/cmds.c:1595
+#: fish/cmds.c:3030
 msgid "create a swap file"
 msgstr ""
 
-#: fish/cmds.c:242 fish/cmds.c:1675
+#: fish/cmds.c:3031
 msgid "load a kernel module"
 msgstr ""
 
-#: fish/cmds.c:243 fish/cmds.c:435
+#: fish/cmds.c:3032
 msgid "view a file"
 msgstr ""
 
-#: fish/cmds.c:244 fish/cmds.c:710
+#: fish/cmds.c:3033
 msgid "mount a guest disk at a position in the filesystem"
 msgstr ""
 
-#: fish/cmds.c:245 fish/cmds.c:1350
+#: fish/cmds.c:3034
+msgid "mount 9p filesystem"
+msgstr ""
+
+#: fish/cmds.c:3035
 msgid "mount a file using the loop device"
 msgstr ""
 
-#: fish/cmds.c:246 fish/cmds.c:1075
+#: fish/cmds.c:3036
 msgid "mount a guest disk with mount options"
 msgstr ""
 
-#: fish/cmds.c:247 fish/cmds.c:1070
+#: fish/cmds.c:3037
 msgid "mount a guest disk, read-only"
 msgstr ""
 
-#: fish/cmds.c:248 fish/cmds.c:1080
+#: fish/cmds.c:3038
 msgid "mount a guest disk with mount options and vfstype"
 msgstr ""
 
-#: fish/cmds.c:249 fish/cmds.c:1440
+#: fish/cmds.c:3039
 msgid "show mountpoints"
 msgstr ""
 
-#: fish/cmds.c:250 fish/cmds.c:935
+#: fish/cmds.c:3040
 msgid "show mounted filesystems"
 msgstr ""
 
-#: fish/cmds.c:251 fish/cmds.c:1150
+#: fish/cmds.c:3041
 msgid "move a file"
 msgstr ""
 
-#: fish/cmds.c:252 fish/cmds.c:1255
+#: fish/cmds.c:3042
 msgid "probe NTFS volume"
 msgstr ""
 
-#: fish/cmds.c:253 fish/cmds.c:1860
+#: fish/cmds.c:3043 fish/cmds.c:3044
 msgid "resize an NTFS filesystem"
 msgstr ""
 
-#: fish/cmds.c:254 fish/cmds.c:1955
+#: fish/cmds.c:3045
 msgid "resize an NTFS filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:255 fish/cmds.c:1750
+#: fish/cmds.c:3046
 msgid "add a partition to the device"
 msgstr ""
 
-#: fish/cmds.c:256 fish/cmds.c:1870
+#: fish/cmds.c:3047
 msgid "delete a partition"
 msgstr ""
 
-#: fish/cmds.c:257 fish/cmds.c:1755
+#: fish/cmds.c:3048
 msgid "partition whole disk with a single primary partition"
 msgstr ""
 
-#: fish/cmds.c:258 fish/cmds.c:1875
+#: fish/cmds.c:3049
 msgid "return true if a partition is bootable"
 msgstr ""
 
-#: fish/cmds.c:259 fish/cmds.c:1880
+#: fish/cmds.c:3050
 msgid "get the MBR type byte (ID byte) from a partition"
 msgstr ""
 
-#: fish/cmds.c:260 fish/cmds.c:1775
+#: fish/cmds.c:3051
 msgid "get the partition table type"
 msgstr ""
 
-#: fish/cmds.c:261 fish/cmds.c:1745
+#: fish/cmds.c:3052
 msgid "create an empty partition table"
 msgstr ""
 
-#: fish/cmds.c:262 fish/cmds.c:1770
+#: fish/cmds.c:3053
 msgid "list partitions on a device"
 msgstr ""
 
-#: fish/cmds.c:263 fish/cmds.c:1760
+#: fish/cmds.c:3054
 msgid "make a partition bootable"
 msgstr ""
 
-#: fish/cmds.c:264 fish/cmds.c:1885
+#: fish/cmds.c:3055
 msgid "set the MBR type byte (ID byte) of a partition"
 msgstr ""
 
-#: fish/cmds.c:265 fish/cmds.c:1765
+#: fish/cmds.c:3056
 msgid "set partition name"
 msgstr ""
 
-#: fish/cmds.c:266 fish/cmds.c:2065
+#: fish/cmds.c:3057
 msgid "convert partition name to device name"
 msgstr ""
 
-#: fish/cmds.c:267 fish/cmds.c:1165
+#: fish/cmds.c:3058
+msgid "convert partition name to partition number"
+msgstr ""
+
+#: fish/cmds.c:3059
 msgid "ping the guest daemon"
 msgstr ""
 
-#: fish/cmds.c:268 fish/cmds.c:1740
+#: fish/cmds.c:3060
 msgid "read part of a file"
 msgstr ""
 
-#: fish/cmds.c:269 fish/cmds.c:2085
+#: fish/cmds.c:3061
 msgid "read part of a device"
 msgstr ""
 
-#: fish/cmds.c:270 fish/cmds.c:900
+#: fish/cmds.c:3062
 msgid "create an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:271 fish/cmds.c:1100
+#: fish/cmds.c:3063
 msgid "remove an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:272 fish/cmds.c:1195
+#: fish/cmds.c:3064
 msgid "resize an LVM physical volume"
 msgstr ""
 
-#: fish/cmds.c:273 fish/cmds.c:1950
+#: fish/cmds.c:3065
 msgid "resize an LVM physical volume (with size)"
 msgstr ""
 
-#: fish/cmds.c:274 fish/cmds.c:275 fish/cmds.c:750 fish/cmds.c:765
+#: fish/cmds.c:3066 fish/cmds.c:3067
 msgid "list the LVM physical volumes (PVs)"
 msgstr ""
 
-#: fish/cmds.c:276 fish/cmds.c:1815
+#: fish/cmds.c:3068
 msgid "get the UUID of a physical volume"
 msgstr ""
 
-#: fish/cmds.c:277 fish/cmds.c:1940
+#: fish/cmds.c:3069
 msgid "write to part of a file"
 msgstr ""
 
-#: fish/cmds.c:278 fish/cmds.c:2080
+#: fish/cmds.c:3070
 msgid "write to part of a device"
 msgstr ""
 
-#: fish/cmds.c:279 fish/cmds.c:1455
+#: fish/cmds.c:3071
 msgid "read a file"
 msgstr ""
 
-#: fish/cmds.c:280 fish/cmds.c:780
+#: fish/cmds.c:3072
 msgid "read file as lines"
 msgstr ""
 
-#: fish/cmds.c:281 fish/cmds.c:1395
+#: fish/cmds.c:3073
 msgid "read directories entries"
 msgstr ""
 
-#: fish/cmds.c:282 fish/cmds.c:1545
+#: fish/cmds.c:3074
 msgid "read the target of a symbolic link"
 msgstr ""
 
-#: fish/cmds.c:283 fish/cmds.c:1735
+#: fish/cmds.c:3075
 msgid "readlink on multiple files"
 msgstr ""
 
-#: fish/cmds.c:284 fish/cmds.c:1520
+#: fish/cmds.c:3076
 msgid "canonicalized absolute pathname"
 msgstr ""
 
-#: fish/cmds.c:286 fish/cmds.c:440
+#: fish/cmds.c:3078
 msgid "close and reopen libguestfs handle"
 msgstr ""
 
-#: fish/cmds.c:287 fish/cmds.c:1235
+#: fish/cmds.c:3079
 msgid "resize an ext2, ext3 or ext4 filesystem"
 msgstr ""
 
-#: fish/cmds.c:288 fish/cmds.c:1945
+#: fish/cmds.c:3080
+msgid "resize an ext2, ext3 or ext4 filesystem to the minimum size"
+msgstr ""
+
+#: fish/cmds.c:3081
 msgid "resize an ext2, ext3 or ext4 filesystem (with size)"
 msgstr ""
 
-#: fish/cmds.c:289 fish/cmds.c:850
+#: fish/cmds.c:3082
 msgid "remove a file"
 msgstr ""
 
-#: fish/cmds.c:290 fish/cmds.c:860
+#: fish/cmds.c:3083
 msgid "remove a file or directory recursively"
 msgstr ""
 
-#: fish/cmds.c:291 fish/cmds.c:855
+#: fish/cmds.c:3084
 msgid "remove a directory"
 msgstr ""
 
-#: fish/cmds.c:292 fish/cmds.c:1450
+#: fish/cmds.c:3085
 msgid "remove a mountpoint"
 msgstr ""
 
-#: fish/cmds.c:293 fish/cmds.c:1275
+#: fish/cmds.c:3086
 msgid "scrub (securely wipe) a device"
 msgstr ""
 
-#: fish/cmds.c:294 fish/cmds.c:1280
+#: fish/cmds.c:3087
 msgid "scrub (securely wipe) a file"
 msgstr ""
 
-#: fish/cmds.c:295 fish/cmds.c:1285
+#: fish/cmds.c:3088
 msgid "scrub (securely wipe) free space"
 msgstr ""
 
-#: fish/cmds.c:296 fish/cmds.c:510
+#: fish/cmds.c:3089
 msgid "add options to kernel command line"
 msgstr ""
 
-#: fish/cmds.c:297 fish/cmds.c:520
+#: fish/cmds.c:3090
+msgid "set the attach method"
+msgstr ""
+
+#: fish/cmds.c:3091
 msgid "set autosync mode"
 msgstr ""
 
-#: fish/cmds.c:298 fish/cmds.c:605
+#: fish/cmds.c:3092
 msgid "enable or disable direct appliance mode"
 msgstr ""
 
-#: fish/cmds.c:299 fish/cmds.c:1105
+#: fish/cmds.c:3093
 msgid "set the ext2/3/4 filesystem label"
 msgstr ""
 
-#: fish/cmds.c:300 fish/cmds.c:1115
+#: fish/cmds.c:3094
 msgid "set the ext2/3/4 filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:301 fish/cmds.c:565
+#: fish/cmds.c:3095
 msgid "set memory allocated to the qemu subprocess"
 msgstr ""
 
-#: fish/cmds.c:302 fish/cmds.c:685
+#: fish/cmds.c:3096
 msgid "set enable network flag"
 msgstr ""
 
-#: fish/cmds.c:303 fish/cmds.c:500
+#: fish/cmds.c:3097
 msgid "set the search path"
 msgstr ""
 
-#: fish/cmds.c:304 fish/cmds.c:490
+#: fish/cmds.c:3098
+msgid "set process group flag"
+msgstr ""
+
+#: fish/cmds.c:3099
 msgid "set the qemu binary"
 msgstr ""
 
-#: fish/cmds.c:305 fish/cmds.c:615
+#: fish/cmds.c:3100
 msgid "enable or disable the recovery process"
 msgstr ""
 
-#: fish/cmds.c:306 fish/cmds.c:585
+#: fish/cmds.c:3101
 msgid "set SELinux enabled or disabled at appliance boot"
 msgstr ""
 
-#: fish/cmds.c:307 fish/cmds.c:595
+#: fish/cmds.c:3102
+msgid "set number of virtual CPUs in appliance"
+msgstr ""
+
+#: fish/cmds.c:3103
 msgid "enable or disable command traces"
 msgstr ""
 
-#: fish/cmds.c:308 fish/cmds.c:530
+#: fish/cmds.c:3104
 msgid "set verbose mode"
 msgstr ""
 
-#: fish/cmds.c:309 fish/cmds.c:1630
+#: fish/cmds.c:3105
 msgid "set SELinux security context"
 msgstr ""
 
-#: fish/cmds.c:311 fish/cmds.c:312 fish/cmds.c:920 fish/cmds.c:1400
+#: fish/cmds.c:3106
+msgid "set an environment variable"
+msgstr ""
+
+#: fish/cmds.c:3108 fish/cmds.c:3109
 msgid "create partitions on a block device"
 msgstr ""
 
-#: fish/cmds.c:313 fish/cmds.c:1200
+#: fish/cmds.c:3110
 msgid "modify a single partition on a block device"
 msgstr ""
 
-#: fish/cmds.c:314 fish/cmds.c:1215
+#: fish/cmds.c:3111
 msgid "display the disk geometry from the partition table"
 msgstr ""
 
-#: fish/cmds.c:315 fish/cmds.c:1210
+#: fish/cmds.c:3112
 msgid "display the kernel geometry"
 msgstr ""
 
-#: fish/cmds.c:316 fish/cmds.c:1205
+#: fish/cmds.c:3113
 msgid "display the partition table"
 msgstr ""
 
-#: fish/cmds.c:317 fish/cmds.c:1260
+#: fish/cmds.c:3114
 msgid "run a command via the shell"
 msgstr ""
 
-#: fish/cmds.c:318 fish/cmds.c:1265
+#: fish/cmds.c:3115
 msgid "run a command via the shell returning lines"
 msgstr ""
 
-#: fish/cmds.c:319 fish/cmds.c:1250
+#: fish/cmds.c:3116
 msgid "sleep for some seconds"
 msgstr ""
 
-#: fish/cmds.c:320 fish/cmds.c:445
+#: fish/cmds.c:3117
 msgid "create a sparse disk image and add"
 msgstr ""
 
-#: fish/cmds.c:321 fish/cmds.c:965
+#: fish/cmds.c:3118
 msgid "get file information"
 msgstr ""
 
-#: fish/cmds.c:322 fish/cmds.c:975
+#: fish/cmds.c:3119
 msgid "get file system statistics"
 msgstr ""
 
-#: fish/cmds.c:323 fish/cmds.c:324 fish/cmds.c:1175 fish/cmds.c:1180
+#: fish/cmds.c:3120 fish/cmds.c:3121
 msgid "print the printable strings in a file"
 msgstr ""
 
-#: fish/cmds.c:325 fish/cmds.c:450
+#: fish/cmds.c:3122
 msgid "list supported groups of commands"
 msgstr ""
 
-#: fish/cmds.c:326 fish/cmds.c:1560
+#: fish/cmds.c:3123
 msgid "disable swap on device"
 msgstr ""
 
-#: fish/cmds.c:327 fish/cmds.c:1570
+#: fish/cmds.c:3124
 msgid "disable swap on file"
 msgstr ""
 
-#: fish/cmds.c:328 fish/cmds.c:1580
+#: fish/cmds.c:3125
 msgid "disable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:329 fish/cmds.c:1590
+#: fish/cmds.c:3126
 msgid "disable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:330 fish/cmds.c:1555
+#: fish/cmds.c:3127
 msgid "enable swap on device"
 msgstr ""
 
-#: fish/cmds.c:331 fish/cmds.c:1565
+#: fish/cmds.c:3128
 msgid "enable swap on file"
 msgstr ""
 
-#: fish/cmds.c:332 fish/cmds.c:1575
+#: fish/cmds.c:3129
 msgid "enable swap on labeled swap partition"
 msgstr ""
 
-#: fish/cmds.c:333 fish/cmds.c:1585
+#: fish/cmds.c:3130
 msgid "enable swap on swap partition by UUID"
 msgstr ""
 
-#: fish/cmds.c:334 fish/cmds.c:715
+#: fish/cmds.c:3131
 msgid "sync disks, writes are flushed through to the disk image"
 msgstr ""
 
-#: fish/cmds.c:335 fish/cmds.c:1320
+#: fish/cmds.c:3132
 msgid "return last 10 lines of a file"
 msgstr ""
 
-#: fish/cmds.c:336 fish/cmds.c:1325
+#: fish/cmds.c:3133
 msgid "return last N lines of a file"
 msgstr ""
 
-#: fish/cmds.c:337 fish/cmds.c:1050
+#: fish/cmds.c:3134
 msgid "unpack tarfile to directory"
 msgstr ""
 
-#: fish/cmds.c:338 fish/cmds.c:1055
+#: fish/cmds.c:3135
 msgid "pack directory into tarfile"
 msgstr ""
 
-#: fish/cmds.c:339 fish/cmds.c:346 fish/cmds.c:1060 fish/cmds.c:1850
+#: fish/cmds.c:3136 fish/cmds.c:3144
 msgid "unpack compressed tarball to directory"
 msgstr ""
 
-#: fish/cmds.c:340 fish/cmds.c:347 fish/cmds.c:1065 fish/cmds.c:1855
+#: fish/cmds.c:3137 fish/cmds.c:3145
 msgid "pack directory into compressed tarball"
 msgstr ""
 
-#: fish/cmds.c:341 fish/cmds.c:455
+#: fish/cmds.c:3138
 msgid "print elapsed time taken to run a command"
 msgstr ""
 
-#: fish/cmds.c:342 fish/cmds.c:720
+#: fish/cmds.c:3139
 msgid "update file timestamps or create a new file"
 msgstr ""
 
-#: fish/cmds.c:343 fish/cmds.c:1700
+#: fish/cmds.c:3140
 msgid "truncate a file to zero size"
 msgstr ""
 
-#: fish/cmds.c:344 fish/cmds.c:1705
+#: fish/cmds.c:3141
 msgid "truncate a file to a particular size"
 msgstr ""
 
-#: fish/cmds.c:345 fish/cmds.c:980
+#: fish/cmds.c:3142
+msgid "adjust ext2/ext3/ext4 filesystem parameters"
+msgstr ""
+
+#: fish/cmds.c:3143
 msgid "get ext2/ext3/ext4 superblock details"
 msgstr ""
 
-#: fish/cmds.c:348 fish/cmds.c:1390
+#: fish/cmds.c:3146
 msgid "set file mode creation mask (umask)"
 msgstr ""
 
-#: fish/cmds.c:349 fish/cmds.c:930
+#: fish/cmds.c:3147
 msgid "unmount a filesystem"
 msgstr ""
 
-#: fish/cmds.c:350 fish/cmds.c:940
+#: fish/cmds.c:3148
 msgid "unmount all filesystems"
 msgstr ""
 
-#: fish/cmds.c:351 fish/cmds.c:1035
+#: fish/cmds.c:3149
+msgid "unset an environment variable"
+msgstr ""
+
+#: fish/cmds.c:3150
 msgid "upload a file from the local machine"
 msgstr ""
 
-#: fish/cmds.c:352 fish/cmds.c:2070
+#: fish/cmds.c:3151
 msgid "upload a file from the local machine with offset"
 msgstr ""
 
-#: fish/cmds.c:353 fish/cmds.c:1710
+#: fish/cmds.c:3152
 msgid "set timestamp of a file with nanosecond precision"
 msgstr ""
 
-#: fish/cmds.c:354 fish/cmds.c:580
+#: fish/cmds.c:3153
 msgid "get the library version number"
 msgstr ""
 
-#: fish/cmds.c:355 fish/cmds.c:1970
+#: fish/cmds.c:3154
 msgid "get the filesystem label"
 msgstr ""
 
-#: fish/cmds.c:356 fish/cmds.c:1695
+#: fish/cmds.c:3155
 msgid "get the Linux VFS type corresponding to a mounted device"
 msgstr ""
 
-#: fish/cmds.c:357 fish/cmds.c:1975
+#: fish/cmds.c:3156
 msgid "get the filesystem UUID"
 msgstr ""
 
-#: fish/cmds.c:358 fish/cmds.c:1225
+#: fish/cmds.c:3157
 msgid "activate or deactivate some volume groups"
 msgstr ""
 
-#: fish/cmds.c:359 fish/cmds.c:1220
+#: fish/cmds.c:3158
 msgid "activate or deactivate all volume groups"
 msgstr ""
 
-#: fish/cmds.c:360 fish/cmds.c:905
+#: fish/cmds.c:3159
 msgid "create an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:361 fish/cmds.c:1835
+#: fish/cmds.c:3160
 msgid "get the LV UUIDs of all LVs in the volume group"
 msgstr ""
 
-#: fish/cmds.c:362 fish/cmds.c:1830
+#: fish/cmds.c:3161
 msgid "get the PV UUIDs containing the volume group"
 msgstr ""
 
-#: fish/cmds.c:363 fish/cmds.c:1095
+#: fish/cmds.c:3162
 msgid "remove an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:364 fish/cmds.c:1805
+#: fish/cmds.c:3163
 msgid "rename an LVM volume group"
 msgstr ""
 
-#: fish/cmds.c:365 fish/cmds.c:366 fish/cmds.c:755 fish/cmds.c:770
+#: fish/cmds.c:3164 fish/cmds.c:3165
 msgid "list the LVM volume groups (VGs)"
 msgstr ""
 
-#: fish/cmds.c:367 fish/cmds.c:1865
+#: fish/cmds.c:3166
 msgid "rescan for LVM physical volumes, volume groups and logical volumes"
 msgstr ""
 
-#: fish/cmds.c:368 fish/cmds.c:1820
+#: fish/cmds.c:3167
 msgid "get the UUID of a volume group"
 msgstr ""
 
-#: fish/cmds.c:369 fish/cmds.c:1305
+#: fish/cmds.c:3168
 msgid "count characters in a file"
 msgstr ""
 
-#: fish/cmds.c:370 fish/cmds.c:1295
+#: fish/cmds.c:3169
 msgid "count lines in a file"
 msgstr ""
 
-#: fish/cmds.c:371 fish/cmds.c:1300
+#: fish/cmds.c:3170
 msgid "count words in a file"
 msgstr ""
 
-#: fish/cmds.c:372 fish/cmds.c:1935
+#: fish/cmds.c:3171
 msgid "create a new file"
 msgstr ""
 
-#: fish/cmds.c:373 fish/cmds.c:925
+#: fish/cmds.c:3172
+msgid "append content to end of file"
+msgstr ""
+
+#: fish/cmds.c:3173
 msgid "create a file"
 msgstr ""
 
-#: fish/cmds.c:376 fish/cmds.c:1130
+#: fish/cmds.c:3176
 msgid "write zeroes to the device"
 msgstr ""
 
-#: fish/cmds.c:377 fish/cmds.c:1845
+#: fish/cmds.c:3177
 msgid "write zeroes to an entire device"
 msgstr ""
 
-#: fish/cmds.c:378 fish/cmds.c:1190
+#: fish/cmds.c:3178
 msgid "zero unused inodes and disk blocks on ext2/3 filesystem"
 msgstr ""
 
-#: fish/cmds.c:381 fish/cmds.c:1405
+#: fish/cmds.c:3181
 msgid "determine file type inside a compressed file"
 msgstr ""
 
-#: fish/cmds.c:384
+#: fish/cmds.c:3184
 msgid "Use -h <cmd> / help <cmd> to show detailed help for a command."
 msgstr ""
 
-#: fish/cmds.c:2371 fish/cmds.c:2384 fish/cmds.c:2399 fish/cmds.c:2415
-#: fish/cmds.c:2431 fish/cmds.c:2448 fish/cmds.c:2466 fish/cmds.c:2481
-#: fish/cmds.c:2498 fish/cmds.c:2513 fish/cmds.c:2530 fish/cmds.c:2545
-#: fish/cmds.c:2561 fish/cmds.c:2575 fish/cmds.c:2592 fish/cmds.c:2606
-#: fish/cmds.c:2621 fish/cmds.c:2636 fish/cmds.c:2651 fish/cmds.c:2666
-#: fish/cmds.c:2681 fish/cmds.c:2698 fish/cmds.c:2730 fish/cmds.c:2745
-#: fish/cmds.c:2760 fish/cmds.c:2778 fish/cmds.c:2792 fish/cmds.c:2809
-#: fish/cmds.c:2823 fish/cmds.c:2840 fish/cmds.c:2854 fish/cmds.c:2871
-#: fish/cmds.c:2885 fish/cmds.c:2903 fish/cmds.c:2921 fish/cmds.c:2938
-#: fish/cmds.c:2957 fish/cmds.c:2975 fish/cmds.c:2994 fish/cmds.c:3013
-#: fish/cmds.c:3032 fish/cmds.c:3050 fish/cmds.c:3068 fish/cmds.c:3087
-#: fish/cmds.c:3106 fish/cmds.c:3125 fish/cmds.c:3139 fish/cmds.c:3154
-#: fish/cmds.c:3224 fish/cmds.c:3244 fish/cmds.c:3259 fish/cmds.c:3274
-#: fish/cmds.c:3292 fish/cmds.c:3313 fish/cmds.c:3334 fish/cmds.c:3353
-#: fish/cmds.c:3369 fish/cmds.c:3385 fish/cmds.c:3401 fish/cmds.c:3417
-#: fish/cmds.c:3433 fish/cmds.c:3449 fish/cmds.c:3465 fish/cmds.c:3483
-#: fish/cmds.c:3505 fish/cmds.c:3540 fish/cmds.c:3556 fish/cmds.c:3578
-#: fish/cmds.c:3599 fish/cmds.c:3619 fish/cmds.c:3638 fish/cmds.c:3656
-#: fish/cmds.c:3675 fish/cmds.c:3692 fish/cmds.c:3709 fish/cmds.c:3722
-#: fish/cmds.c:3737 fish/cmds.c:3756 fish/cmds.c:3774 fish/cmds.c:3792
-#: fish/cmds.c:3810 fish/cmds.c:3828 fish/cmds.c:3847 fish/cmds.c:3886
-#: fish/cmds.c:3942 fish/cmds.c:3962 fish/cmds.c:3982 fish/cmds.c:4002
-#: fish/cmds.c:4019 fish/cmds.c:4040 fish/cmds.c:4077 fish/cmds.c:4098
-#: fish/cmds.c:4176 fish/cmds.c:4214 fish/cmds.c:4228 fish/cmds.c:4244
-#: fish/cmds.c:4257 fish/cmds.c:4272 fish/cmds.c:4293 fish/cmds.c:4314
-#: fish/cmds.c:4335 fish/cmds.c:4356 fish/cmds.c:4377 fish/cmds.c:4398
-#: fish/cmds.c:4417 fish/cmds.c:4433 fish/cmds.c:4449 fish/cmds.c:4467
-#: fish/cmds.c:4485 fish/cmds.c:4504 fish/cmds.c:4539 fish/cmds.c:4557
-#: fish/cmds.c:4575 fish/cmds.c:4591 fish/cmds.c:4608 fish/cmds.c:4630
-#: fish/cmds.c:4652 fish/cmds.c:4675 fish/cmds.c:4697 fish/cmds.c:4717
-#: fish/cmds.c:4739 fish/cmds.c:4761 fish/cmds.c:4780 fish/cmds.c:4801
-#: fish/cmds.c:4821 fish/cmds.c:4843 fish/cmds.c:4859 fish/cmds.c:4875
-#: fish/cmds.c:4892 fish/cmds.c:4909 fish/cmds.c:4929 fish/cmds.c:4946
-#: fish/cmds.c:4966 fish/cmds.c:4985 fish/cmds.c:5002 fish/cmds.c:5022
-#: fish/cmds.c:5044 fish/cmds.c:5066 fish/cmds.c:5087 fish/cmds.c:5119
-#: fish/cmds.c:5135 fish/cmds.c:5151 fish/cmds.c:5174 fish/cmds.c:5196
-#: fish/cmds.c:5218 fish/cmds.c:5239 fish/cmds.c:5255 fish/cmds.c:5276
-#: fish/cmds.c:5369 fish/cmds.c:5388 fish/cmds.c:5407 fish/cmds.c:5426
-#: fish/cmds.c:5443 fish/cmds.c:5463 fish/cmds.c:5498 fish/cmds.c:5514
-#: fish/cmds.c:5535 fish/cmds.c:5551 fish/cmds.c:5586 fish/cmds.c:5605
-#: fish/cmds.c:5624 fish/cmds.c:5643 fish/cmds.c:5664 fish/cmds.c:5680
-#: fish/cmds.c:5698 fish/cmds.c:5716 fish/cmds.c:5737 fish/cmds.c:5757
-#: fish/cmds.c:5777 fish/cmds.c:5797 fish/cmds.c:5819 fish/cmds.c:5859
-#: fish/cmds.c:5881 fish/cmds.c:5919 fish/cmds.c:5935 fish/cmds.c:5953
-#: fish/cmds.c:5973 fish/cmds.c:5995 fish/cmds.c:6016 fish/cmds.c:6033
-#: fish/cmds.c:6051 fish/cmds.c:6071 fish/cmds.c:6147 fish/cmds.c:6187
-#: fish/cmds.c:6265 fish/cmds.c:6340 fish/cmds.c:6376 fish/cmds.c:6398
-#: fish/cmds.c:6418 fish/cmds.c:6440 fish/cmds.c:6461 fish/cmds.c:6485
-#: fish/cmds.c:6527 fish/cmds.c:6567 fish/cmds.c:6587 fish/cmds.c:6604
-#: fish/cmds.c:6622 fish/cmds.c:6638 fish/cmds.c:6655 fish/cmds.c:6681
-#: fish/cmds.c:6704 fish/cmds.c:6727 fish/cmds.c:6750 fish/cmds.c:6773
-#: fish/cmds.c:6796 fish/cmds.c:6819 fish/cmds.c:6842 fish/cmds.c:6865
-#: fish/cmds.c:6888 fish/cmds.c:6911 fish/cmds.c:6934 fish/cmds.c:6956
-#: fish/cmds.c:6978 fish/cmds.c:6998 fish/cmds.c:7018 fish/cmds.c:7038
-#: fish/cmds.c:7057 fish/cmds.c:7079 fish/cmds.c:7116 fish/cmds.c:7132
-#: fish/cmds.c:7148 fish/cmds.c:7166 fish/cmds.c:7184 fish/cmds.c:7200
-#: fish/cmds.c:7216 fish/cmds.c:7232 fish/cmds.c:7248 fish/cmds.c:7266
-#: fish/cmds.c:7301 fish/cmds.c:7340 fish/cmds.c:7372 fish/cmds.c:7388
-#: fish/cmds.c:7404 fish/cmds.c:7419 fish/cmds.c:7433 fish/cmds.c:7453
-#: fish/cmds.c:7490 fish/cmds.c:7527 fish/cmds.c:7565 fish/cmds.c:7604
-#: fish/cmds.c:7644 fish/cmds.c:7684 fish/cmds.c:7721 fish/cmds.c:7737
-#: fish/cmds.c:7759 fish/cmds.c:7780 fish/cmds.c:7801 fish/cmds.c:7820
-#: fish/cmds.c:7839 fish/cmds.c:7874 fish/cmds.c:7945 fish/cmds.c:7984
-#: fish/cmds.c:8041 fish/cmds.c:8066 fish/cmds.c:8091 fish/cmds.c:8118
-#: fish/cmds.c:8176 fish/cmds.c:8196 fish/cmds.c:8240 fish/cmds.c:8259
-#: fish/cmds.c:8297 fish/cmds.c:8333 fish/cmds.c:8352 fish/cmds.c:8373
-#: fish/cmds.c:8429 fish/cmds.c:8448 fish/cmds.c:8469 fish/cmds.c:8490
-#: fish/cmds.c:8508 fish/cmds.c:8527 fish/cmds.c:8553 fish/cmds.c:8572
-#: fish/cmds.c:8591 fish/cmds.c:8610 fish/cmds.c:8629 fish/cmds.c:8650
-#: fish/cmds.c:8684 fish/cmds.c:8701 fish/cmds.c:8723 fish/cmds.c:8744
-#: fish/cmds.c:8758 fish/cmds.c:8774 fish/cmds.c:8810 fish/cmds.c:8848
-#: fish/cmds.c:8887 fish/cmds.c:8942 fish/cmds.c:8963 fish/cmds.c:8998
-#: fish/cmds.c:9012 fish/cmds.c:9031 fish/cmds.c:9070 fish/cmds.c:9092
-#: fish/cmds.c:9115 fish/cmds.c:9139 fish/cmds.c:9179 fish/cmds.c:9203
-#: fish/cmds.c:9240 fish/cmds.c:9270 fish/cmds.c:9300 fish/cmds.c:9327
-#: fish/cmds.c:9346 fish/cmds.c:9377 fish/cmds.c:9396 fish/cmds.c:9415
-#: fish/cmds.c:9431 fish/cmds.c:9448 fish/cmds.c:9470 fish/cmds.c:9490
-#: fish/cmds.c:9508 fish/cmds.c:9549 fish/cmds.c:9591 fish/cmds.c:9634
-#: fish/cmds.c:9672 fish/cmds.c:9690 fish/cmds.c:9709 fish/cmds.c:9728
-#: fish/cmds.c:9748 fish/cmds.c:9768 fish/cmds.c:9788 fish/cmds.c:9808
-#: fish/cmds.c:9828 fish/cmds.c:9849 fish/cmds.c:9886 fish/cmds.c:9936
-#: fish/cmds.c:9973 fish/cmds.c:10028
+#: fish/cmds.c:3532 fish/cmds.c:3546 fish/cmds.c:3562 fish/cmds.c:3579
+#: fish/cmds.c:3596 fish/cmds.c:3614 fish/cmds.c:3633 fish/cmds.c:3649
+#: fish/cmds.c:3667 fish/cmds.c:3683 fish/cmds.c:3701 fish/cmds.c:3717
+#: fish/cmds.c:3734 fish/cmds.c:3749 fish/cmds.c:3767 fish/cmds.c:3782
+#: fish/cmds.c:3798 fish/cmds.c:3814 fish/cmds.c:3830 fish/cmds.c:3846
+#: fish/cmds.c:3862 fish/cmds.c:3880 fish/cmds.c:3913 fish/cmds.c:3929
+#: fish/cmds.c:3945 fish/cmds.c:3964 fish/cmds.c:3979 fish/cmds.c:3997
+#: fish/cmds.c:4012 fish/cmds.c:4030 fish/cmds.c:4045 fish/cmds.c:4063
+#: fish/cmds.c:4078 fish/cmds.c:4097 fish/cmds.c:4116 fish/cmds.c:4134
+#: fish/cmds.c:4154 fish/cmds.c:4173 fish/cmds.c:4193 fish/cmds.c:4213
+#: fish/cmds.c:4233 fish/cmds.c:4252 fish/cmds.c:4271 fish/cmds.c:4291
+#: fish/cmds.c:4311 fish/cmds.c:4331 fish/cmds.c:4346 fish/cmds.c:4362
+#: fish/cmds.c:4439 fish/cmds.c:4457 fish/cmds.c:4474 fish/cmds.c:4491
+#: fish/cmds.c:4580 fish/cmds.c:4600 fish/cmds.c:4620 fish/cmds.c:4640
+#: fish/cmds.c:4660 fish/cmds.c:4680 fish/cmds.c:4699 fish/cmds.c:4718
+#: fish/cmds.c:4737 fish/cmds.c:4752 fish/cmds.c:4771 fish/cmds.c:4791
+#: fish/cmds.c:4811 fish/cmds.c:4887 fish/cmds.c:4902 fish/cmds.c:4920
+#: fish/cmds.c:4953 fish/cmds.c:4972 fish/cmds.c:4988 fish/cmds.c:5004
+#: fish/cmds.c:5023 fish/cmds.c:5045 fish/cmds.c:5067 fish/cmds.c:5087
+#: fish/cmds.c:5104 fish/cmds.c:5121 fish/cmds.c:5138 fish/cmds.c:5155
+#: fish/cmds.c:5172 fish/cmds.c:5189 fish/cmds.c:5206 fish/cmds.c:5225
+#: fish/cmds.c:5248 fish/cmds.c:5284 fish/cmds.c:5301 fish/cmds.c:5324
+#: fish/cmds.c:5346 fish/cmds.c:5367 fish/cmds.c:5387 fish/cmds.c:5406
+#: fish/cmds.c:5426 fish/cmds.c:5444 fish/cmds.c:5462 fish/cmds.c:5476
+#: fish/cmds.c:5492 fish/cmds.c:5512 fish/cmds.c:5531 fish/cmds.c:5550
+#: fish/cmds.c:5569 fish/cmds.c:5588 fish/cmds.c:5608 fish/cmds.c:5648
+#: fish/cmds.c:5705 fish/cmds.c:5726 fish/cmds.c:5747 fish/cmds.c:5768
+#: fish/cmds.c:5786 fish/cmds.c:5808 fish/cmds.c:5846 fish/cmds.c:5868
+#: fish/cmds.c:5947 fish/cmds.c:5986 fish/cmds.c:6001 fish/cmds.c:6018
+#: fish/cmds.c:6032 fish/cmds.c:6048 fish/cmds.c:6070 fish/cmds.c:6092
+#: fish/cmds.c:6114 fish/cmds.c:6136 fish/cmds.c:6158 fish/cmds.c:6180
+#: fish/cmds.c:6200 fish/cmds.c:6217 fish/cmds.c:6234 fish/cmds.c:6253
+#: fish/cmds.c:6272 fish/cmds.c:6292 fish/cmds.c:6328 fish/cmds.c:6347
+#: fish/cmds.c:6366 fish/cmds.c:6383 fish/cmds.c:6401 fish/cmds.c:6424
+#: fish/cmds.c:6447 fish/cmds.c:6471 fish/cmds.c:6494 fish/cmds.c:6515
+#: fish/cmds.c:6538 fish/cmds.c:6561 fish/cmds.c:6581 fish/cmds.c:6603
+#: fish/cmds.c:6624 fish/cmds.c:6647 fish/cmds.c:6664 fish/cmds.c:6681
+#: fish/cmds.c:6699 fish/cmds.c:6717 fish/cmds.c:6738 fish/cmds.c:6756
+#: fish/cmds.c:6777 fish/cmds.c:6797 fish/cmds.c:6815 fish/cmds.c:6836
+#: fish/cmds.c:6859 fish/cmds.c:6882 fish/cmds.c:6904 fish/cmds.c:6937
+#: fish/cmds.c:6954 fish/cmds.c:6971 fish/cmds.c:6995 fish/cmds.c:7018
+#: fish/cmds.c:7041 fish/cmds.c:7063 fish/cmds.c:7080 fish/cmds.c:7102
+#: fish/cmds.c:7196 fish/cmds.c:7216 fish/cmds.c:7236 fish/cmds.c:7256
+#: fish/cmds.c:7274 fish/cmds.c:7295 fish/cmds.c:7331 fish/cmds.c:7348
+#: fish/cmds.c:7370 fish/cmds.c:7387 fish/cmds.c:7423 fish/cmds.c:7443
+#: fish/cmds.c:7463 fish/cmds.c:7483 fish/cmds.c:7505 fish/cmds.c:7522
+#: fish/cmds.c:7541 fish/cmds.c:7560 fish/cmds.c:7582 fish/cmds.c:7603
+#: fish/cmds.c:7624 fish/cmds.c:7645 fish/cmds.c:7668 fish/cmds.c:7709
+#: fish/cmds.c:7732 fish/cmds.c:7771 fish/cmds.c:7788 fish/cmds.c:7807
+#: fish/cmds.c:7828 fish/cmds.c:7851 fish/cmds.c:7873 fish/cmds.c:7891
+#: fish/cmds.c:7910 fish/cmds.c:7931 fish/cmds.c:8008 fish/cmds.c:8049
+#: fish/cmds.c:8128 fish/cmds.c:8204 fish/cmds.c:8241 fish/cmds.c:8264
+#: fish/cmds.c:8285 fish/cmds.c:8308 fish/cmds.c:8330 fish/cmds.c:8355
+#: fish/cmds.c:8398 fish/cmds.c:8439 fish/cmds.c:8460 fish/cmds.c:8478
+#: fish/cmds.c:8497 fish/cmds.c:8514 fish/cmds.c:8532 fish/cmds.c:8559
+#: fish/cmds.c:8583 fish/cmds.c:8607 fish/cmds.c:8631 fish/cmds.c:8655
+#: fish/cmds.c:8679 fish/cmds.c:8703 fish/cmds.c:8727 fish/cmds.c:8751
+#: fish/cmds.c:8775 fish/cmds.c:8799 fish/cmds.c:8823 fish/cmds.c:8846
+#: fish/cmds.c:8869 fish/cmds.c:8890 fish/cmds.c:8911 fish/cmds.c:8932
+#: fish/cmds.c:8952 fish/cmds.c:8975 fish/cmds.c:9013 fish/cmds.c:9030
+#: fish/cmds.c:9047 fish/cmds.c:9066 fish/cmds.c:9085 fish/cmds.c:9102
+#: fish/cmds.c:9119 fish/cmds.c:9136 fish/cmds.c:9153 fish/cmds.c:9172
+#: fish/cmds.c:9208 fish/cmds.c:9248 fish/cmds.c:9281 fish/cmds.c:9298
+#: fish/cmds.c:9315 fish/cmds.c:9331 fish/cmds.c:9346 fish/cmds.c:9367
+#: fish/cmds.c:9405 fish/cmds.c:9443 fish/cmds.c:9482 fish/cmds.c:9522
+#: fish/cmds.c:9563 fish/cmds.c:9604 fish/cmds.c:9642 fish/cmds.c:9659
+#: fish/cmds.c:9682 fish/cmds.c:9704 fish/cmds.c:9726 fish/cmds.c:9746
+#: fish/cmds.c:9766 fish/cmds.c:9802 fish/cmds.c:9874 fish/cmds.c:9914
+#: fish/cmds.c:9972 fish/cmds.c:9998 fish/cmds.c:10024 fish/cmds.c:10052
+#: fish/cmds.c:10111 fish/cmds.c:10132 fish/cmds.c:10177 fish/cmds.c:10197
+#: fish/cmds.c:10236 fish/cmds.c:10273 fish/cmds.c:10293 fish/cmds.c:10315
+#: fish/cmds.c:10372 fish/cmds.c:10392 fish/cmds.c:10414 fish/cmds.c:10436
+#: fish/cmds.c:10455 fish/cmds.c:10475 fish/cmds.c:10502 fish/cmds.c:10522
+#: fish/cmds.c:10542 fish/cmds.c:10562 fish/cmds.c:10582 fish/cmds.c:10604
+#: fish/cmds.c:10639 fish/cmds.c:10657 fish/cmds.c:10680 fish/cmds.c:10702
+#: fish/cmds.c:10717 fish/cmds.c:10734 fish/cmds.c:10771 fish/cmds.c:10810
+#: fish/cmds.c:10850 fish/cmds.c:10906 fish/cmds.c:10928 fish/cmds.c:10964
+#: fish/cmds.c:10979 fish/cmds.c:10999 fish/cmds.c:11039 fish/cmds.c:11062
+#: fish/cmds.c:11086 fish/cmds.c:11111 fish/cmds.c:11152 fish/cmds.c:11177
+#: fish/cmds.c:11215 fish/cmds.c:11246 fish/cmds.c:11277 fish/cmds.c:11305
+#: fish/cmds.c:11325 fish/cmds.c:11357 fish/cmds.c:11377 fish/cmds.c:11397
+#: fish/cmds.c:11414 fish/cmds.c:11432 fish/cmds.c:11457 fish/cmds.c:11480
+#: fish/cmds.c:11499 fish/cmds.c:11543 fish/cmds.c:11588 fish/cmds.c:11636
+#: fish/cmds.c:11677 fish/cmds.c:11696 fish/cmds.c:11716 fish/cmds.c:11736
+#: fish/cmds.c:11757 fish/cmds.c:11778 fish/cmds.c:11799 fish/cmds.c:11820
+#: fish/cmds.c:11841 fish/cmds.c:11863 fish/cmds.c:11901 fish/cmds.c:11952
+#: fish/cmds.c:11990 fish/cmds.c:12046 fish/cmds.c:12182 fish/cmds.c:12211
+#: fish/cmds.c:12238 fish/cmds.c:12255 fish/cmds.c:12276 fish/cmds.c:12293
+#: fish/cmds.c:12355 fish/cmds.c:12493 fish/cmds.c:12651 fish/cmds.c:13363
+#: fish/cmds.c:13382 fish/cmds.c:13402 fish/cmds.c:13419
 #, c-format
 msgid "%s should have %d parameter(s)\n"
 msgstr ""
 
-#: fish/cmds.c:2372 fish/cmds.c:2385 fish/cmds.c:2400 fish/cmds.c:2416
-#: fish/cmds.c:2432 fish/cmds.c:2449 fish/cmds.c:2467 fish/cmds.c:2482
-#: fish/cmds.c:2499 fish/cmds.c:2514 fish/cmds.c:2531 fish/cmds.c:2546
-#: fish/cmds.c:2562 fish/cmds.c:2576 fish/cmds.c:2593 fish/cmds.c:2607
-#: fish/cmds.c:2622 fish/cmds.c:2637 fish/cmds.c:2652 fish/cmds.c:2667
-#: fish/cmds.c:2682 fish/cmds.c:2699 fish/cmds.c:2731 fish/cmds.c:2746
-#: fish/cmds.c:2761 fish/cmds.c:2779 fish/cmds.c:2793 fish/cmds.c:2810
-#: fish/cmds.c:2824 fish/cmds.c:2841 fish/cmds.c:2855 fish/cmds.c:2872
-#: fish/cmds.c:2886 fish/cmds.c:2904 fish/cmds.c:2922 fish/cmds.c:2939
-#: fish/cmds.c:2958 fish/cmds.c:2976 fish/cmds.c:2995 fish/cmds.c:3014
-#: fish/cmds.c:3033 fish/cmds.c:3051 fish/cmds.c:3069 fish/cmds.c:3088
-#: fish/cmds.c:3107 fish/cmds.c:3126 fish/cmds.c:3140 fish/cmds.c:3155
-#: fish/cmds.c:3175 fish/cmds.c:3225 fish/cmds.c:3245 fish/cmds.c:3260
-#: fish/cmds.c:3275 fish/cmds.c:3293 fish/cmds.c:3314 fish/cmds.c:3335
-#: fish/cmds.c:3354 fish/cmds.c:3370 fish/cmds.c:3386 fish/cmds.c:3402
-#: fish/cmds.c:3418 fish/cmds.c:3434 fish/cmds.c:3450 fish/cmds.c:3466
-#: fish/cmds.c:3484 fish/cmds.c:3506 fish/cmds.c:3541 fish/cmds.c:3557
-#: fish/cmds.c:3579 fish/cmds.c:3600 fish/cmds.c:3620 fish/cmds.c:3639
-#: fish/cmds.c:3657 fish/cmds.c:3676 fish/cmds.c:3693 fish/cmds.c:3710
-#: fish/cmds.c:3723 fish/cmds.c:3738 fish/cmds.c:3757 fish/cmds.c:3775
-#: fish/cmds.c:3793 fish/cmds.c:3811 fish/cmds.c:3829 fish/cmds.c:3848
-#: fish/cmds.c:3887 fish/cmds.c:3943 fish/cmds.c:3963 fish/cmds.c:3983
-#: fish/cmds.c:4003 fish/cmds.c:4020 fish/cmds.c:4041 fish/cmds.c:4078
-#: fish/cmds.c:4099 fish/cmds.c:4177 fish/cmds.c:4215 fish/cmds.c:4229
-#: fish/cmds.c:4245 fish/cmds.c:4258 fish/cmds.c:4273 fish/cmds.c:4294
-#: fish/cmds.c:4315 fish/cmds.c:4336 fish/cmds.c:4357 fish/cmds.c:4378
-#: fish/cmds.c:4399 fish/cmds.c:4418 fish/cmds.c:4434 fish/cmds.c:4450
-#: fish/cmds.c:4468 fish/cmds.c:4486 fish/cmds.c:4505 fish/cmds.c:4540
-#: fish/cmds.c:4558 fish/cmds.c:4576 fish/cmds.c:4592 fish/cmds.c:4609
-#: fish/cmds.c:4631 fish/cmds.c:4653 fish/cmds.c:4676 fish/cmds.c:4698
-#: fish/cmds.c:4718 fish/cmds.c:4740 fish/cmds.c:4762 fish/cmds.c:4781
-#: fish/cmds.c:4802 fish/cmds.c:4822 fish/cmds.c:4844 fish/cmds.c:4860
-#: fish/cmds.c:4876 fish/cmds.c:4893 fish/cmds.c:4910 fish/cmds.c:4930
-#: fish/cmds.c:4947 fish/cmds.c:4967 fish/cmds.c:4986 fish/cmds.c:5003
-#: fish/cmds.c:5023 fish/cmds.c:5045 fish/cmds.c:5067 fish/cmds.c:5088
-#: fish/cmds.c:5120 fish/cmds.c:5136 fish/cmds.c:5152 fish/cmds.c:5175
-#: fish/cmds.c:5197 fish/cmds.c:5219 fish/cmds.c:5240 fish/cmds.c:5256
-#: fish/cmds.c:5277 fish/cmds.c:5370 fish/cmds.c:5389 fish/cmds.c:5408
-#: fish/cmds.c:5427 fish/cmds.c:5444 fish/cmds.c:5464 fish/cmds.c:5499
-#: fish/cmds.c:5515 fish/cmds.c:5536 fish/cmds.c:5552 fish/cmds.c:5587
-#: fish/cmds.c:5606 fish/cmds.c:5625 fish/cmds.c:5644 fish/cmds.c:5665
-#: fish/cmds.c:5681 fish/cmds.c:5699 fish/cmds.c:5717 fish/cmds.c:5738
-#: fish/cmds.c:5758 fish/cmds.c:5778 fish/cmds.c:5798 fish/cmds.c:5820
-#: fish/cmds.c:5860 fish/cmds.c:5882 fish/cmds.c:5920 fish/cmds.c:5936
-#: fish/cmds.c:5954 fish/cmds.c:5974 fish/cmds.c:5996 fish/cmds.c:6017
-#: fish/cmds.c:6034 fish/cmds.c:6052 fish/cmds.c:6072 fish/cmds.c:6148
-#: fish/cmds.c:6188 fish/cmds.c:6266 fish/cmds.c:6341 fish/cmds.c:6377
-#: fish/cmds.c:6399 fish/cmds.c:6419 fish/cmds.c:6441 fish/cmds.c:6462
-#: fish/cmds.c:6486 fish/cmds.c:6528 fish/cmds.c:6568 fish/cmds.c:6588
-#: fish/cmds.c:6605 fish/cmds.c:6623 fish/cmds.c:6639 fish/cmds.c:6656
-#: fish/cmds.c:6682 fish/cmds.c:6705 fish/cmds.c:6728 fish/cmds.c:6751
-#: fish/cmds.c:6774 fish/cmds.c:6797 fish/cmds.c:6820 fish/cmds.c:6843
-#: fish/cmds.c:6866 fish/cmds.c:6889 fish/cmds.c:6912 fish/cmds.c:6935
-#: fish/cmds.c:6957 fish/cmds.c:6979 fish/cmds.c:6999 fish/cmds.c:7019
-#: fish/cmds.c:7039 fish/cmds.c:7058 fish/cmds.c:7080 fish/cmds.c:7117
-#: fish/cmds.c:7133 fish/cmds.c:7149 fish/cmds.c:7167 fish/cmds.c:7185
-#: fish/cmds.c:7201 fish/cmds.c:7217 fish/cmds.c:7233 fish/cmds.c:7249
-#: fish/cmds.c:7267 fish/cmds.c:7302 fish/cmds.c:7341 fish/cmds.c:7373
-#: fish/cmds.c:7389 fish/cmds.c:7405 fish/cmds.c:7420 fish/cmds.c:7434
-#: fish/cmds.c:7454 fish/cmds.c:7491 fish/cmds.c:7528 fish/cmds.c:7566
-#: fish/cmds.c:7605 fish/cmds.c:7645 fish/cmds.c:7685 fish/cmds.c:7722
-#: fish/cmds.c:7738 fish/cmds.c:7760 fish/cmds.c:7781 fish/cmds.c:7802
-#: fish/cmds.c:7821 fish/cmds.c:7840 fish/cmds.c:7875 fish/cmds.c:7946
-#: fish/cmds.c:7985 fish/cmds.c:8042 fish/cmds.c:8067 fish/cmds.c:8092
-#: fish/cmds.c:8119 fish/cmds.c:8177 fish/cmds.c:8197 fish/cmds.c:8241
-#: fish/cmds.c:8260 fish/cmds.c:8298 fish/cmds.c:8334 fish/cmds.c:8353
-#: fish/cmds.c:8374 fish/cmds.c:8430 fish/cmds.c:8449 fish/cmds.c:8470
-#: fish/cmds.c:8491 fish/cmds.c:8509 fish/cmds.c:8528 fish/cmds.c:8554
-#: fish/cmds.c:8573 fish/cmds.c:8592 fish/cmds.c:8611 fish/cmds.c:8630
-#: fish/cmds.c:8651 fish/cmds.c:8685 fish/cmds.c:8702 fish/cmds.c:8724
-#: fish/cmds.c:8745 fish/cmds.c:8759 fish/cmds.c:8775 fish/cmds.c:8811
-#: fish/cmds.c:8849 fish/cmds.c:8888 fish/cmds.c:8943 fish/cmds.c:8964
-#: fish/cmds.c:8999 fish/cmds.c:9013 fish/cmds.c:9032 fish/cmds.c:9071
-#: fish/cmds.c:9093 fish/cmds.c:9116 fish/cmds.c:9140 fish/cmds.c:9180
-#: fish/cmds.c:9204 fish/cmds.c:9241 fish/cmds.c:9271 fish/cmds.c:9301
-#: fish/cmds.c:9328 fish/cmds.c:9347 fish/cmds.c:9378 fish/cmds.c:9397
-#: fish/cmds.c:9416 fish/cmds.c:9432 fish/cmds.c:9449 fish/cmds.c:9471
-#: fish/cmds.c:9491 fish/cmds.c:9509 fish/cmds.c:9550 fish/cmds.c:9592
-#: fish/cmds.c:9635 fish/cmds.c:9673 fish/cmds.c:9691 fish/cmds.c:9710
-#: fish/cmds.c:9729 fish/cmds.c:9749 fish/cmds.c:9769 fish/cmds.c:9789
-#: fish/cmds.c:9809 fish/cmds.c:9829 fish/cmds.c:9850 fish/cmds.c:9887
-#: fish/cmds.c:9937 fish/cmds.c:9974 fish/cmds.c:10029
+#: fish/cmds.c:3533 fish/cmds.c:3547 fish/cmds.c:3563 fish/cmds.c:3580
+#: fish/cmds.c:3597 fish/cmds.c:3615 fish/cmds.c:3634 fish/cmds.c:3650
+#: fish/cmds.c:3668 fish/cmds.c:3684 fish/cmds.c:3702 fish/cmds.c:3718
+#: fish/cmds.c:3735 fish/cmds.c:3750 fish/cmds.c:3768 fish/cmds.c:3783
+#: fish/cmds.c:3799 fish/cmds.c:3815 fish/cmds.c:3831 fish/cmds.c:3847
+#: fish/cmds.c:3863 fish/cmds.c:3881 fish/cmds.c:3914 fish/cmds.c:3930
+#: fish/cmds.c:3946 fish/cmds.c:3965 fish/cmds.c:3980 fish/cmds.c:3998
+#: fish/cmds.c:4013 fish/cmds.c:4031 fish/cmds.c:4046 fish/cmds.c:4064
+#: fish/cmds.c:4079 fish/cmds.c:4098 fish/cmds.c:4117 fish/cmds.c:4135
+#: fish/cmds.c:4155 fish/cmds.c:4174 fish/cmds.c:4194 fish/cmds.c:4214
+#: fish/cmds.c:4234 fish/cmds.c:4253 fish/cmds.c:4272 fish/cmds.c:4292
+#: fish/cmds.c:4312 fish/cmds.c:4332 fish/cmds.c:4347 fish/cmds.c:4363
+#: fish/cmds.c:4384 fish/cmds.c:4440 fish/cmds.c:4458 fish/cmds.c:4475
+#: fish/cmds.c:4492 fish/cmds.c:4513 fish/cmds.c:4581 fish/cmds.c:4601
+#: fish/cmds.c:4621 fish/cmds.c:4641 fish/cmds.c:4661 fish/cmds.c:4681
+#: fish/cmds.c:4700 fish/cmds.c:4719 fish/cmds.c:4738 fish/cmds.c:4753
+#: fish/cmds.c:4772 fish/cmds.c:4792 fish/cmds.c:4812 fish/cmds.c:4835
+#: fish/cmds.c:4888 fish/cmds.c:4903 fish/cmds.c:4921 fish/cmds.c:4954
+#: fish/cmds.c:4973 fish/cmds.c:4989 fish/cmds.c:5005 fish/cmds.c:5024
+#: fish/cmds.c:5046 fish/cmds.c:5068 fish/cmds.c:5088 fish/cmds.c:5105
+#: fish/cmds.c:5122 fish/cmds.c:5139 fish/cmds.c:5156 fish/cmds.c:5173
+#: fish/cmds.c:5190 fish/cmds.c:5207 fish/cmds.c:5226 fish/cmds.c:5249
+#: fish/cmds.c:5285 fish/cmds.c:5302 fish/cmds.c:5325 fish/cmds.c:5347
+#: fish/cmds.c:5368 fish/cmds.c:5388 fish/cmds.c:5407 fish/cmds.c:5427
+#: fish/cmds.c:5445 fish/cmds.c:5463 fish/cmds.c:5477 fish/cmds.c:5493
+#: fish/cmds.c:5513 fish/cmds.c:5532 fish/cmds.c:5551 fish/cmds.c:5570
+#: fish/cmds.c:5589 fish/cmds.c:5609 fish/cmds.c:5649 fish/cmds.c:5706
+#: fish/cmds.c:5727 fish/cmds.c:5748 fish/cmds.c:5769 fish/cmds.c:5787
+#: fish/cmds.c:5809 fish/cmds.c:5847 fish/cmds.c:5869 fish/cmds.c:5948
+#: fish/cmds.c:5987 fish/cmds.c:6002 fish/cmds.c:6019 fish/cmds.c:6033
+#: 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:6181 fish/cmds.c:6201
+#: fish/cmds.c:6218 fish/cmds.c:6235 fish/cmds.c:6254 fish/cmds.c:6273
+#: fish/cmds.c:6293 fish/cmds.c:6329 fish/cmds.c:6348 fish/cmds.c:6367
+#: fish/cmds.c:6384 fish/cmds.c:6402 fish/cmds.c:6425 fish/cmds.c:6448
+#: fish/cmds.c:6472 fish/cmds.c:6495 fish/cmds.c:6516 fish/cmds.c:6539
+#: fish/cmds.c:6562 fish/cmds.c:6582 fish/cmds.c:6604 fish/cmds.c:6625
+#: fish/cmds.c:6648 fish/cmds.c:6665 fish/cmds.c:6682 fish/cmds.c:6700
+#: fish/cmds.c:6718 fish/cmds.c:6739 fish/cmds.c:6757 fish/cmds.c:6778
+#: fish/cmds.c:6798 fish/cmds.c:6816 fish/cmds.c:6837 fish/cmds.c:6860
+#: fish/cmds.c:6883 fish/cmds.c:6905 fish/cmds.c:6938 fish/cmds.c:6955
+#: fish/cmds.c:6972 fish/cmds.c:6996 fish/cmds.c:7019 fish/cmds.c:7042
+#: fish/cmds.c:7064 fish/cmds.c:7081 fish/cmds.c:7103 fish/cmds.c:7197
+#: fish/cmds.c:7217 fish/cmds.c:7237 fish/cmds.c:7257 fish/cmds.c:7275
+#: fish/cmds.c:7296 fish/cmds.c:7332 fish/cmds.c:7349 fish/cmds.c:7371
+#: fish/cmds.c:7388 fish/cmds.c:7424 fish/cmds.c:7444 fish/cmds.c:7464
+#: fish/cmds.c:7484 fish/cmds.c:7506 fish/cmds.c:7523 fish/cmds.c:7542
+#: fish/cmds.c:7561 fish/cmds.c:7583 fish/cmds.c:7604 fish/cmds.c:7625
+#: fish/cmds.c:7646 fish/cmds.c:7669 fish/cmds.c:7710 fish/cmds.c:7733
+#: fish/cmds.c:7772 fish/cmds.c:7789 fish/cmds.c:7808 fish/cmds.c:7829
+#: fish/cmds.c:7852 fish/cmds.c:7874 fish/cmds.c:7892 fish/cmds.c:7911
+#: fish/cmds.c:7932 fish/cmds.c:8009 fish/cmds.c:8050 fish/cmds.c:8129
+#: fish/cmds.c:8205 fish/cmds.c:8242 fish/cmds.c:8265 fish/cmds.c:8286
+#: fish/cmds.c:8309 fish/cmds.c:8331 fish/cmds.c:8356 fish/cmds.c:8399
+#: fish/cmds.c:8440 fish/cmds.c:8461 fish/cmds.c:8479 fish/cmds.c:8498
+#: fish/cmds.c:8515 fish/cmds.c:8533 fish/cmds.c:8560 fish/cmds.c:8584
+#: fish/cmds.c:8608 fish/cmds.c:8632 fish/cmds.c:8656 fish/cmds.c:8680
+#: fish/cmds.c:8704 fish/cmds.c:8728 fish/cmds.c:8752 fish/cmds.c:8776
+#: fish/cmds.c:8800 fish/cmds.c:8824 fish/cmds.c:8847 fish/cmds.c:8870
+#: fish/cmds.c:8891 fish/cmds.c:8912 fish/cmds.c:8933 fish/cmds.c:8953
+#: fish/cmds.c:8976 fish/cmds.c:9014 fish/cmds.c:9031 fish/cmds.c:9048
+#: fish/cmds.c:9067 fish/cmds.c:9086 fish/cmds.c:9103 fish/cmds.c:9120
+#: fish/cmds.c:9137 fish/cmds.c:9154 fish/cmds.c:9173 fish/cmds.c:9209
+#: fish/cmds.c:9249 fish/cmds.c:9282 fish/cmds.c:9299 fish/cmds.c:9316
+#: fish/cmds.c:9332 fish/cmds.c:9347 fish/cmds.c:9368 fish/cmds.c:9406
+#: fish/cmds.c:9444 fish/cmds.c:9483 fish/cmds.c:9523 fish/cmds.c:9564
+#: fish/cmds.c:9605 fish/cmds.c:9643 fish/cmds.c:9660 fish/cmds.c:9683
+#: fish/cmds.c:9705 fish/cmds.c:9727 fish/cmds.c:9747 fish/cmds.c:9767
+#: fish/cmds.c:9803 fish/cmds.c:9875 fish/cmds.c:9915 fish/cmds.c:9973
+#: fish/cmds.c:9999 fish/cmds.c:10025 fish/cmds.c:10053 fish/cmds.c:10112
+#: fish/cmds.c:10133 fish/cmds.c:10178 fish/cmds.c:10198 fish/cmds.c:10237
+#: fish/cmds.c:10274 fish/cmds.c:10294 fish/cmds.c:10316 fish/cmds.c:10373
+#: fish/cmds.c:10393 fish/cmds.c:10415 fish/cmds.c:10437 fish/cmds.c:10456
+#: fish/cmds.c:10476 fish/cmds.c:10503 fish/cmds.c:10523 fish/cmds.c:10543
+#: fish/cmds.c:10563 fish/cmds.c:10583 fish/cmds.c:10605 fish/cmds.c:10640
+#: fish/cmds.c:10658 fish/cmds.c:10681 fish/cmds.c:10703 fish/cmds.c:10718
+#: fish/cmds.c:10735 fish/cmds.c:10772 fish/cmds.c:10811 fish/cmds.c:10851
+#: fish/cmds.c:10907 fish/cmds.c:10929 fish/cmds.c:10965 fish/cmds.c:10980
+#: fish/cmds.c:11000 fish/cmds.c:11040 fish/cmds.c:11063 fish/cmds.c:11087
+#: fish/cmds.c:11112 fish/cmds.c:11153 fish/cmds.c:11178 fish/cmds.c:11216
+#: fish/cmds.c:11247 fish/cmds.c:11278 fish/cmds.c:11306 fish/cmds.c:11326
+#: fish/cmds.c:11358 fish/cmds.c:11378 fish/cmds.c:11398 fish/cmds.c:11415
+#: fish/cmds.c:11433 fish/cmds.c:11458 fish/cmds.c:11481 fish/cmds.c:11500
+#: fish/cmds.c:11544 fish/cmds.c:11589 fish/cmds.c:11637 fish/cmds.c:11678
+#: fish/cmds.c:11697 fish/cmds.c:11717 fish/cmds.c:11737 fish/cmds.c:11758
+#: fish/cmds.c:11779 fish/cmds.c:11800 fish/cmds.c:11821 fish/cmds.c:11842
+#: fish/cmds.c:11864 fish/cmds.c:11902 fish/cmds.c:11953 fish/cmds.c:11991
+#: fish/cmds.c:12047 fish/cmds.c:12070 fish/cmds.c:12183 fish/cmds.c:12212
+#: fish/cmds.c:12239 fish/cmds.c:12256 fish/cmds.c:12277 fish/cmds.c:12294
+#: fish/cmds.c:12316 fish/cmds.c:12356 fish/cmds.c:12377 fish/cmds.c:12437
+#: fish/cmds.c:12494 fish/cmds.c:12520 fish/cmds.c:12589 fish/cmds.c:12652
+#: fish/cmds.c:12674 fish/cmds.c:12765 fish/cmds.c:12858 fish/cmds.c:12951
+#: fish/cmds.c:13045 fish/cmds.c:13242 fish/cmds.c:13364 fish/cmds.c:13383
+#: fish/cmds.c:13403 fish/cmds.c:13420
 #, c-format
 msgid "type 'help %s' for help on %s\n"
 msgstr ""
 
-#: fish/cmds.c:2709 fish/cmds.c:3518 fish/cmds.c:3858 fish/cmds.c:3897
-#: fish/cmds.c:3916 fish/cmds.c:4053 fish/cmds.c:4110 fish/cmds.c:4129
-#: fish/cmds.c:4148 fish/cmds.c:4190 fish/cmds.c:4516 fish/cmds.c:5098
-#: fish/cmds.c:5288 fish/cmds.c:5307 fish/cmds.c:5326 fish/cmds.c:5345
-#: fish/cmds.c:5475 fish/cmds.c:5562 fish/cmds.c:5830 fish/cmds.c:5892
-#: fish/cmds.c:6082 fish/cmds.c:6101 fish/cmds.c:6120 fish/cmds.c:6158
-#: fish/cmds.c:6198 fish/cmds.c:6217 fish/cmds.c:6236 fish/cmds.c:6276
-#: fish/cmds.c:6295 fish/cmds.c:6314 fish/cmds.c:6351 fish/cmds.c:6498
-#: fish/cmds.c:6540 fish/cmds.c:7092 fish/cmds.c:7277 fish/cmds.c:7314
-#: fish/cmds.c:7351 fish/cmds.c:7465 fish/cmds.c:7501 fish/cmds.c:7538
-#: fish/cmds.c:7576 fish/cmds.c:7616 fish/cmds.c:7656 fish/cmds.c:7696
-#: fish/cmds.c:7852 fish/cmds.c:7887 fish/cmds.c:7900 fish/cmds.c:7913
-#: fish/cmds.c:7926 fish/cmds.c:7958 fish/cmds.c:7995 fish/cmds.c:8014
-#: fish/cmds.c:8131 fish/cmds.c:8150 fish/cmds.c:8209 fish/cmds.c:8222
-#: fish/cmds.c:8271 fish/cmds.c:8309 fish/cmds.c:8384 fish/cmds.c:8403
-#: fish/cmds.c:8665 fish/cmds.c:8786 fish/cmds.c:8822 fish/cmds.c:8860
-#: fish/cmds.c:8899 fish/cmds.c:8918 fish/cmds.c:8975 fish/cmds.c:9045
-#: fish/cmds.c:9151 fish/cmds.c:9219 fish/cmds.c:9252 fish/cmds.c:9282
-#: fish/cmds.c:9312 fish/cmds.c:9359 fish/cmds.c:9522 fish/cmds.c:9563
-#: fish/cmds.c:9607 fish/cmds.c:9648 fish/cmds.c:9864 fish/cmds.c:9901
-#: fish/cmds.c:9914 fish/cmds.c:9951 fish/cmds.c:9985 fish/cmds.c:10004
+#: fish/cmds.c:3891 fish/cmds.c:4931 fish/cmds.c:5261 fish/cmds.c:5619
+#: fish/cmds.c:5659 fish/cmds.c:5678 fish/cmds.c:5821 fish/cmds.c:5880
+#: fish/cmds.c:5899 fish/cmds.c:5918 fish/cmds.c:5961 fish/cmds.c:6304
+#: fish/cmds.c:6915 fish/cmds.c:7114 fish/cmds.c:7133 fish/cmds.c:7152
+#: fish/cmds.c:7171 fish/cmds.c:7307 fish/cmds.c:7398 fish/cmds.c:7679
+#: fish/cmds.c:7743 fish/cmds.c:7942 fish/cmds.c:7961 fish/cmds.c:7980
+#: fish/cmds.c:8019 fish/cmds.c:8060 fish/cmds.c:8079 fish/cmds.c:8098
+#: fish/cmds.c:8139 fish/cmds.c:8158 fish/cmds.c:8177 fish/cmds.c:8215
+#: fish/cmds.c:8368 fish/cmds.c:8411 fish/cmds.c:8988 fish/cmds.c:9183
+#: fish/cmds.c:9221 fish/cmds.c:9259 fish/cmds.c:9379 fish/cmds.c:9416
+#: fish/cmds.c:9454 fish/cmds.c:9493 fish/cmds.c:9534 fish/cmds.c:9575
+#: fish/cmds.c:9616 fish/cmds.c:9779 fish/cmds.c:9815 fish/cmds.c:9828
+#: fish/cmds.c:9841 fish/cmds.c:9854 fish/cmds.c:9887 fish/cmds.c:9925
+#: fish/cmds.c:9944 fish/cmds.c:10065 fish/cmds.c:10084 fish/cmds.c:10145
+#: fish/cmds.c:10158 fish/cmds.c:10209 fish/cmds.c:10248 fish/cmds.c:10326
+#: fish/cmds.c:10345 fish/cmds.c:10619 fish/cmds.c:10746 fish/cmds.c:10783
+#: fish/cmds.c:10822 fish/cmds.c:10862 fish/cmds.c:10881 fish/cmds.c:10940
+#: fish/cmds.c:11013 fish/cmds.c:11123 fish/cmds.c:11193 fish/cmds.c:11227
+#: fish/cmds.c:11258 fish/cmds.c:11289 fish/cmds.c:11338 fish/cmds.c:11515
+#: fish/cmds.c:11559 fish/cmds.c:11608 fish/cmds.c:11652 fish/cmds.c:11878
+#: fish/cmds.c:11916 fish/cmds.c:11929 fish/cmds.c:11967 fish/cmds.c:12002
+#: fish/cmds.c:12021 fish/cmds.c:12088 fish/cmds.c:12116 fish/cmds.c:12139
+#: fish/cmds.c:12394 fish/cmds.c:12455 fish/cmds.c:12541 fish/cmds.c:12609
+#: fish/cmds.c:12692 fish/cmds.c:12709 fish/cmds.c:12726 fish/cmds.c:12784
+#: fish/cmds.c:12801 fish/cmds.c:12818 fish/cmds.c:12877 fish/cmds.c:12894
+#: fish/cmds.c:12911 fish/cmds.c:12971 fish/cmds.c:12988 fish/cmds.c:13005
+#: fish/cmds.c:13067 fish/cmds.c:13090 fish/cmds.c:13118 fish/cmds.c:13135
+#: fish/cmds.c:13158 fish/cmds.c:13186 fish/cmds.c:13203 fish/cmds.c:13261
+#: fish/cmds.c:13278 fish/cmds.c:13301 fish/cmds.c:13324
 #, c-format
 msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
 msgstr ""
 
-#: fish/cmds.c:2715 fish/cmds.c:3524 fish/cmds.c:3864 fish/cmds.c:3903
-#: fish/cmds.c:3922 fish/cmds.c:4059 fish/cmds.c:4116 fish/cmds.c:4135
-#: fish/cmds.c:4154 fish/cmds.c:4196 fish/cmds.c:4522 fish/cmds.c:5104
-#: fish/cmds.c:5294 fish/cmds.c:5313 fish/cmds.c:5332 fish/cmds.c:5351
-#: fish/cmds.c:5481 fish/cmds.c:5568 fish/cmds.c:5836 fish/cmds.c:5898
-#: fish/cmds.c:6088 fish/cmds.c:6107 fish/cmds.c:6126 fish/cmds.c:6164
-#: fish/cmds.c:6204 fish/cmds.c:6223 fish/cmds.c:6242 fish/cmds.c:6282
-#: fish/cmds.c:6301 fish/cmds.c:6320 fish/cmds.c:6357 fish/cmds.c:6504
-#: fish/cmds.c:6546 fish/cmds.c:7098 fish/cmds.c:7283 fish/cmds.c:7320
-#: fish/cmds.c:7357 fish/cmds.c:7471 fish/cmds.c:7507 fish/cmds.c:7544
-#: fish/cmds.c:7582 fish/cmds.c:7622 fish/cmds.c:7662 fish/cmds.c:7702
-#: fish/cmds.c:7964 fish/cmds.c:8001 fish/cmds.c:8020 fish/cmds.c:8137
-#: fish/cmds.c:8277 fish/cmds.c:8315 fish/cmds.c:8390 fish/cmds.c:8409
-#: fish/cmds.c:8792 fish/cmds.c:8828 fish/cmds.c:8866 fish/cmds.c:8905
-#: fish/cmds.c:8924 fish/cmds.c:8981 fish/cmds.c:9051 fish/cmds.c:9157
-#: fish/cmds.c:9528 fish/cmds.c:9569 fish/cmds.c:9613 fish/cmds.c:9654
-#: fish/cmds.c:9991
+#: fish/cmds.c:3897 fish/cmds.c:4937 fish/cmds.c:5267 fish/cmds.c:5625
+#: fish/cmds.c:5665 fish/cmds.c:5684 fish/cmds.c:5827 fish/cmds.c:5886
+#: fish/cmds.c:5905 fish/cmds.c:5924 fish/cmds.c:5967 fish/cmds.c:6310
+#: fish/cmds.c:6921 fish/cmds.c:7120 fish/cmds.c:7139 fish/cmds.c:7158
+#: fish/cmds.c:7177 fish/cmds.c:7313 fish/cmds.c:7404 fish/cmds.c:7685
+#: fish/cmds.c:7749 fish/cmds.c:7948 fish/cmds.c:7967 fish/cmds.c:7986
+#: fish/cmds.c:8025 fish/cmds.c:8066 fish/cmds.c:8085 fish/cmds.c:8104
+#: fish/cmds.c:8145 fish/cmds.c:8164 fish/cmds.c:8183 fish/cmds.c:8221
+#: fish/cmds.c:8374 fish/cmds.c:8417 fish/cmds.c:8994 fish/cmds.c:9189
+#: fish/cmds.c:9227 fish/cmds.c:9265 fish/cmds.c:9385 fish/cmds.c:9422
+#: fish/cmds.c:9460 fish/cmds.c:9499 fish/cmds.c:9540 fish/cmds.c:9581
+#: fish/cmds.c:9622 fish/cmds.c:9893 fish/cmds.c:9931 fish/cmds.c:9950
+#: fish/cmds.c:10071 fish/cmds.c:10215 fish/cmds.c:10254 fish/cmds.c:10332
+#: fish/cmds.c:10351 fish/cmds.c:10752 fish/cmds.c:10789 fish/cmds.c:10828
+#: fish/cmds.c:10868 fish/cmds.c:10887 fish/cmds.c:10946 fish/cmds.c:11019
+#: fish/cmds.c:11129 fish/cmds.c:11521 fish/cmds.c:11565 fish/cmds.c:11614
+#: fish/cmds.c:11658 fish/cmds.c:12008 fish/cmds.c:12094 fish/cmds.c:12122
+#: fish/cmds.c:12145 fish/cmds.c:12547 fish/cmds.c:12615 fish/cmds.c:13073
+#: fish/cmds.c:13096 fish/cmds.c:13141 fish/cmds.c:13164 fish/cmds.c:13284
+#: fish/cmds.c:13307
 #, c-format
 msgid "%s: %s: integer out of range\n"
 msgstr ""
 
-#: fish/cmds.c:3174
+#: fish/cmds.c:4383 fish/cmds.c:4512 fish/cmds.c:4834 fish/cmds.c:12069
+#: fish/cmds.c:12315 fish/cmds.c:12376 fish/cmds.c:12436 fish/cmds.c:12519
+#: fish/cmds.c:12588 fish/cmds.c:12673 fish/cmds.c:12764 fish/cmds.c:12857
+#: fish/cmds.c:12950 fish/cmds.c:13044 fish/cmds.c:13241
 #, c-format
 msgid "%s should have %d-%d parameter(s)\n"
 msgstr ""
 
-#: fish/cmds.c:3200
+#: fish/cmds.c:4414 fish/cmds.c:4553 fish/cmds.c:4855 fish/cmds.c:12155
+#: fish/cmds.c:12332 fish/cmds.c:12409 fish/cmds.c:12465 fish/cmds.c:12557
+#: fish/cmds.c:12625 fish/cmds.c:12736 fish/cmds.c:12828 fish/cmds.c:12921
+#: fish/cmds.c:13015 fish/cmds.c:13213 fish/cmds.c:13339
 #, c-format
 msgid "%s: unknown optional argument \"%s\"\n"
 msgstr ""
 
-#: fish/cmds.c:3206
+#: fish/cmds.c:4420 fish/cmds.c:4559 fish/cmds.c:4861 fish/cmds.c:12161
+#: fish/cmds.c:12338 fish/cmds.c:12415 fish/cmds.c:12471 fish/cmds.c:12563
+#: fish/cmds.c:12631 fish/cmds.c:12742 fish/cmds.c:12834 fish/cmds.c:12927
+#: fish/cmds.c:13021 fish/cmds.c:13219 fish/cmds.c:13345
 #, c-format
 msgid "%s: optional argument \"%s\" given twice\n"
 msgstr ""
 
-#: fish/cmds.c:11066
+#: fish/cmds.c:13440
 #, 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 "display filename\n"
+msgstr ""
+
+#: fish/edit.c:45
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr ""
 
-#: fish/fish.c:86 fuse/guestmount.c:869
+#: fish/event-names.c:138
 #, c-format
-msgid "Try `%s --help' for more information.\n"
+msgid "unknown event name: %s\n"
+msgstr ""
+
+#: fish/events.c:161
+#, c-format
+msgid "use 'event <name> <eventset> <script>' to register an event handler\n"
+msgstr ""
+
+#: fish/events.c:220
+#, c-format
+msgid "use 'delete-event <name>' to delete an event handler\n"
+msgstr ""
+
+#: fish/events.c:229
+#, c-format
+msgid "delete-event: %s: no such event handler\n"
+msgstr ""
+
+#: fish/events.c:266
+#, c-format
+msgid "use 'list-events' to list event handlers\n"
 msgstr ""
 
-#: fish/fish.c:90
+#: 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"
@@ -1610,7 +2189,8 @@ msgid ""
 "  -i|--inspector       Automatically mount filesystems\n"
 "  --keys-from-stdin    Read passphrases from stdin\n"
 "  --listen             Listen for remote commands\n"
-"  -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
+"  --live               Connect to a live virtual machine\n"
+"  -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n"
 "  -n|--no-sync         Don't autosync\n"
 "  -N|--new type        Create prepared disk (test1.img, ...)\n"
 "  --progress-bars      Enable progress bars even when not interactive\n"
@@ -1620,113 +2200,108 @@ msgid ""
 "  --selinux            Enable SELinux support\n"
 "  -v|--verbose         Verbose messages\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:201 fuse/guestmount.c:975
-#, c-format
-msgid "guestfs_create: failed to create handle\n"
-msgstr ""
-
-#: fish/fish.c:238
+#: fish/fish.c:247
 #, c-format
 msgid "%s: --listen=PID: PID was not a number: %s\n"
 msgstr ""
 
-#: fish/fish.c:245
+#: fish/fish.c:254
 #, c-format
 msgid ""
 "%s: remote: $GUESTFISH_PID must be set to the PID of the remote process\n"
 msgstr ""
 
-#: fish/fish.c:267 fuse/guestmount.c:1020
-#, c-format
-msgid "%s: unknown long option: %s (%d)\n"
-msgstr ""
-
-#: fish/fish.c:291
+#: fish/fish.c:304
 #, c-format
 msgid "%s: only one -f parameter can be given\n"
 msgstr ""
 
-#: fish/fish.c:441
+#: fish/fish.c:477
 #, c-format
 msgid "%s: cannot use --listen and --remote options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:449
+#: fish/fish.c:485
 #, c-format
 msgid "%s: extra parameters on the command line with --listen flag\n"
 msgstr ""
 
-#: fish/fish.c:455
+#: fish/fish.c:491
 #, c-format
 msgid "%s: cannot use --listen and --file options at the same time\n"
 msgstr ""
 
-#: fish/fish.c:512
-#, c-format
-msgid "guestfish: could not access termcap or terminfo database.\n"
-msgstr ""
-
-#: fish/fish.c:516
-#, c-format
-msgid "guestfish: terminal type \"%s\" not defined.\n"
-msgstr ""
-
-#: fish/fish.c:625
+#: fish/fish.c:644
 #, 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:712
-#, c-format
-msgid "%s: unterminated double quote\n"
-msgstr ""
-
-#: fish/fish.c:718 fish/fish.c:735
+#: fish/fish.c:795 fish/fish.c:811
 #, c-format
 msgid "%s: command arguments not separated by whitespace\n"
 msgstr ""
 
-#: fish/fish.c:729
+#: fish/fish.c:805
 #, c-format
 msgid "%s: unterminated single quote\n"
 msgstr ""
 
-#: fish/fish.c:784
+#: fish/fish.c:835
 #, c-format
 msgid "%s: internal error parsing string at '%s'\n"
 msgstr ""
 
-#: fish/fish.c:801
+#: fish/fish.c:852
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr ""
 
-#: fish/fish.c:830
+#: fish/fish.c:927
+#, c-format
+msgid "%s: invalid escape sequence in string (starting at offset %d)\n"
+msgstr ""
+
+#: fish/fish.c:936
+#, c-format
+msgid "%s: unterminated double quote\n"
+msgstr ""
+
+#: fish/fish.c:1001
 #, c-format
 msgid "%s: empty command on command line\n"
 msgstr ""
 
-#: fish/fish.c:971
+#: fish/fish.c:1148
 msgid "display a list of commands or help on a command"
 msgstr ""
 
-#: fish/fish.c:973
+#: fish/fish.c:1150
 msgid "quit guestfish"
 msgstr ""
 
-#: fish/fish.c:984
+#: fish/fish.c:1161
 #, c-format
 msgid ""
 "help - display a list of commands or help on a command\n"
@@ -1734,19 +2309,19 @@ msgid ""
 "     help\n"
 msgstr ""
 
-#: fish/fish.c:992
+#: fish/fish.c:1169
 #, c-format
 msgid ""
 "quit - quit guestfish\n"
 "     quit\n"
 msgstr ""
 
-#: fish/fish.c:997
+#: fish/fish.c:1174
 #, c-format
 msgid "%s: command not known, use -h to list all commands\n"
 msgstr ""
 
-#: fish/fish.c:1013
+#: fish/fish.c:1190
 #, c-format
 msgid ""
 "Did you mean to open a disk image?  guestfish -a disk.img\n"
@@ -1754,14 +2329,36 @@ msgid ""
 "For complete documentation:         man guestfish\n"
 msgstr ""
 
-#: fish/fish.c:1170
+#: fish/fish.c:1199
+#, c-format
+msgid "%s:%d: libguestfs: error: %s\n"
+msgstr ""
+
+#: fish/fish.c:1355
 #, c-format
 msgid "Runaway quote in string \"%s\"\n"
 msgstr ""
 
-#: fish/fish.c:1506
+#: fish/fish.c:1552
 #, c-format
-msgid "Enter key or passphrase (\"%s\"): "
+msgid ""
+"%s: to use Windows drive letters, you must inspect the guest (\"-i\" option "
+"or run \"inspect-os\" command)\n"
+msgstr ""
+
+#: fish/fish.c:1572
+#, c-format
+msgid ""
+"%s: drive '%c:' not found.  To list available drives do:\n"
+"  inspect-get-drive-mappings %s\n"
+msgstr ""
+
+#: fish/fish.c:1591
+#, 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
@@ -1774,6 +2371,31 @@ msgstr ""
 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"
@@ -1797,52 +2419,95 @@ msgstr ""
 msgid "hexedit: invalid range\n"
 msgstr ""
 
-#: fish/inspect.c:79
+#: 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 ""
+"%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:111
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%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:85
+#: fish/inspect.c:170
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:125
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:138
+#: 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:36
+#: fish/options.c:38
 #, c-format
 msgid "%s: too many drives added on the command line\n"
 msgstr ""
 
-#: fish/options.c:118
+#: fish/options.c:152
 #, c-format
 msgid "%s: '%s' could not be mounted.  Did you mean one of these?\n"
 msgstr ""
@@ -1962,43 +2627,53 @@ msgstr ""
 msgid "failed to create filesystem (%s): %s"
 msgstr ""
 
-#: fish/rc.c:250
+#: fish/rc.c:257
 #, c-format
 msgid "guestfish: protocol error: could not read 'hello' message\n"
 msgstr ""
 
-#: fish/rc.c:255
+#: 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:330 fish/rc.c:344
+#: 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:356 fish/rc.c:370
+#: 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:381
+#: 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 ""
@@ -2007,115 +2682,167 @@ 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 "%s: could not connect to libvirt (code %d, domain %d): %s\n"
-msgstr ""
-
-#: fish/virt.c:80
+#: fuse/guestmount.c:912
 #, c-format
-msgid "%s: no libvirt domain called '%s': %s\n"
-msgstr ""
-
-#: fish/virt.c:88
-#, c-format
-msgid "%s: 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 ""
-"%s: 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 "%s: 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 "%s: unable to parse XML information returned by libvirt\n"
+msgid "%s: --live is not compatible with -i option\n"
 msgstr ""
 
-#: fish/virt.c:121
+#: fuse/guestmount.c:1163
 #, c-format
-msgid "%s: unable to create new XPath context\n"
+msgid "%s: with --live, you must use exactly one -d option\n"
 msgstr ""
 
-#: fish/virt.c:129
+#: fuse/guestmount.c:1170
 #, c-format
-msgid "%s: unable to evaluate XPath expression\n"
+msgid "%s: --live is not compatible with -a option\n"
 msgstr ""
 
-#: fish/virt.c:204
+#: fuse/guestmount.c:1179
 #, c-format
-msgid "%s: libvirt domain '%s' has no disks\n"
+msgid "%s: you must specify a mountpoint in the host filesystem\n"
 msgstr ""
 
-#: fuse/guestmount.c:873
+#: 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-2010 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"
 "  -c|--connect uri     Specify libvirt URI for -d option\n"
-"  --dir-cache-timeout  Set readdir cache timeout (default 5 sec)\n"
 "  -d|--domain guest    Add disks from libvirt guest\n"
+"  --echo-keys          Don't turn off echo for passphrases\n"
 "  --format[=raw|..]    Force disk format for -a option\n"
-"  --fuse-help          Display extra FUSE options\n"
-"  -i|--inspector       Automatically mount filesystems\n"
-"  --help               Display help message and exit\n"
-"  -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n"
-"  -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"
+"  --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           Trace guestfs API calls\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:1084
+#: inspector/virt-inspector.c:255
 #, c-format
-msgid "%s: must have at least one -a/-d and at least one -m/-i option\n"
+msgid "%s: cannot use --xpath together with other options.\n"
 msgstr ""
 
-#: fuse/guestmount.c:1092
+#: inspector/virt-inspector.c:288
 #, c-format
-msgid "%s: you must specify a mountpoint in the host filesystem\n"
-msgstr ""
-
-#: inspector/virt-inspector.pl:134
-msgid "virt-inspector: no image or VM names given"
-msgstr ""
-
-#: inspector/virt-inspector.pl:145 tools/virt-cat.pl:161
-#: tools/virt-edit.pl:185 tools/virt-ls.pl:194 tools/virt-tar.pl:238
-#: tools/virt-win-reg.pl:292
-#, perl-brace-format
 msgid ""
-"{prog}: No operating system could be detected inside this disk image.\n"
+"%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.c:313
+#, c-format
+msgid "%s: XML write error at \"%s\": %m\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:325
+#, c-format
+msgid "%s: xmlOutputBufferCreateFd: failed to open stdout\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:333
+#, c-format
+msgid "%s: xmlNewTextWriter: failed to create libxml2 writer\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:827
+#, c-format
+msgid "%s: unable to parse XML from stdin\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:833
+#, c-format
+msgid "%s: unable to create new XPath context\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:840
+#, c-format
+msgid "%s: unable to evaluate XPath expression\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:851
+#, c-format
+msgid "%s: xmlSaveToFd failed\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:858
+#, c-format
+msgid "%s: xmlNewDoc failed\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:863
+#, c-format
+msgid "%s: xmlCopyNode failed\n"
+msgstr ""
+
+#: inspector/virt-inspector.c:870
+#, c-format
+msgid "%s: xmlSaveDoc failed\n"
+msgstr ""
+
 #: perl/lib/Sys/Guestfs/Lib.pm:158
 msgid "open_guest: first parameter must be a string or an arrayref"
 msgstr ""
@@ -2170,754 +2897,724 @@ msgid ""
 "information about the disk image as possible.\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:900
-#, perl-brace-format
-msgid "unknown filesystem label {label}\n"
-msgstr ""
-
-#: perl/lib/Sys/Guestfs/Lib.pm:910
-#, perl-brace-format
-msgid "unknown filesystem UUID {uuid}\n"
-msgstr ""
-
-#: perl/lib/Sys/Guestfs/Lib.pm:933
+#: perl/lib/Sys/Guestfs/Lib.pm:945
 #, perl-brace-format
 msgid "unknown filesystem {fs}\n"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1011
+#: perl/lib/Sys/Guestfs/Lib.pm:1023
 #, perl-brace-format
 msgid "Error running rpm -qa: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1037
+#: perl/lib/Sys/Guestfs/Lib.pm:1049
 #, perl-brace-format
 msgid "Error running dpkg-query: {error}"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1102
+#: perl/lib/Sys/Guestfs/Lib.pm:1114
 msgid "Can't find grub on guest"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1157
+#: perl/lib/Sys/Guestfs/Lib.pm:1169
 #, perl-brace-format
 msgid "Grub entry {title} has no kernel"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1188
+#: 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:1211
+#: 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:1280
+#: 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:1288
+#: 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:1342
+#: perl/lib/Sys/Guestfs/Lib.pm:1354
 #, perl-brace-format
 msgid "{path} doesn't match augeas pattern"
 msgstr ""
 
-#: perl/lib/Sys/Guestfs/Lib.pm:1381
+#: perl/lib/Sys/Guestfs/Lib.pm:1393
 #, perl-brace-format
 msgid "{filename}: could not read initrd format"
 msgstr ""
 
-#: src/appliance.c:138
+#: rescue/virt-rescue.c:66
 #, c-format
 msgid ""
-"cannot find any suitable libguestfs supermin or ordinary appliance on "
-"LIBGUESTFS_PATH (search path: %s)"
+"%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/appliance.c:353
+#: rescue/virt-rescue.c:167
 #, c-format
-msgid "failed to create temporary cache directory: %m"
+msgid "%s: could not parse --smp parameter '%s'\n"
 msgstr ""
 
-#: src/appliance.c:441
+#: rescue/virt-rescue.c:172
 #, c-format
-msgid "error renaming temporary cache directory: %m"
-msgstr ""
-
-#: src/appliance.c:517
-msgid "external command failed, see earlier error messages"
+msgid "%s: --smp parameter '%s' should be >= 1\n"
 msgstr ""
 
-#: src/guestfs.c:178
+#: rescue/virt-rescue.c:202
 #, c-format
-msgid "guestfs_close: called twice on the same handle\n"
+msgid "%s: could not parse memory size '%s'\n"
 msgstr ""
 
-#: src/guestfs.c:283
+#: rescue/virt-rescue.c:372
 #, c-format
-msgid "libguestfs: error: %s\n"
+msgid ""
+"Inspecting the virtual machine or disk image ...\n"
+"\n"
 msgstr ""
 
-#: src/guestfs.c:762
+#: rescue/virt-rescue.c:391
 #, c-format
-msgid "<truncated, original size %zu bytes>"
+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/inspect.c:960
+#: rescue/virt-rescue.c:401
 #, c-format
-msgid "cannot resolve Windows %%SYSTEMROOT%%"
+msgid ""
+"# %s is the root of a %s operating system\n"
+"# type: %s, distro: %s, version: %d.%d\n"
+"# %s\n"
+"\n"
 msgstr ""
 
-#: src/inspect.c:1176
-msgid "no inspection data: call guestfs_inspect_os first"
+#: 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/inspect.c:1188
+#: rescue/virt-rescue.c:465
 #, c-format
 msgid ""
-"%s: root device not found: only call this function with a root device "
-"previously returned by guestfs_inspect_os"
+"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/inspect.c:1278
-msgid "not a Windows guest, or systemroot could not be determined"
+#: rescue/virt-rescue.c:470
+#, c-format
+msgid "# %s has type '%s'\n"
 msgstr ""
 
-#: src/launch.c:94
-msgid "command line cannot be altered after qemu subprocess launched"
+#: rescue/virt-rescue.c:594
+#, c-format
+msgid "%s: unknown child exit status (%d)\n"
 msgstr ""
 
-#: src/launch.c:108
-msgid "guestfs_config: parameter must begin with '-' character"
+#: src/appliance.c:182
+#, c-format
+msgid ""
+"cannot find any suitable libguestfs supermin or ordinary appliance on "
+"LIBGUESTFS_PATH (search path: %s)"
 msgstr ""
 
-#: src/launch.c:122
+#: src/appliance.c:332
 #, c-format
-msgid "guestfs_config: parameter '%s' isn't allowed"
+msgid "security: cached appliance %s is not owned by UID %d"
 msgstr ""
 
-#: src/launch.c:188 src/launch.c:292
-msgid "filename cannot contain ',' (comma) character"
+#: src/appliance.c:337
+#, c-format
+msgid "security: cached appliance %s is not a directory (mode %o)"
 msgstr ""
 
-#: src/launch.c:200 src/launch.c:205
+#: src/appliance.c:342
 #, c-format
-msgid "%s parameter is empty or contains disallowed characters"
+msgid "security: cached appliance %s is writable by group or other (mode %o)"
 msgstr ""
 
-#: src/launch.c:317
-msgid "you must call guestfs_add_drive before guestfs_launch"
+#: src/appliance.c:672
+msgid "external command failed, see earlier error messages"
 msgstr ""
 
-#: src/launch.c:322
-msgid "the libguestfs handle has already been launched"
+#: src/dbdump.c:85
+msgid "unexpected end of output from db_dump command before end of header"
 msgstr ""
 
-#: src/launch.c:334
-#, c-format
-msgid "%s: cannot create temporary directory"
+#: src/dbdump.c:98 src/dbdump.c:110
+msgid "unexpected line from db_dump command, no space prefix"
 msgstr ""
 
-#: src/launch.c:682
-msgid "guestfs_launch failed, see earlier error messages"
+#: src/dbdump.c:127
+msgid "unexpected end of output from db_dump command before end of data"
 msgstr ""
 
-#: src/launch.c:695
-msgid "qemu launched and contacted daemon, but state != READY"
+#: src/dbdump.c:208
+msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/launch.c:836
+#: src/filearch.c:152
 #, c-format
-msgid ""
-"%s: command failed: If qemu is located on a non-standard path, try setting "
-"the LIBGUESTFS_QEMU environment variable."
+msgid "size of %s unreasonable (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/launch.c:928
-msgid "qemu has not been launched yet"
+#: src/filearch.c:265
+msgid ""
+"file-architecture API not available since this version of libguestfs was "
+"compiled without the libmagic library"
 msgstr ""
 
-#: src/launch.c:939
-msgid "no subprocess to kill"
+#: src/guestfs.c:177
+#, c-format
+msgid "guestfs_close: called twice on the same handle\n"
 msgstr ""
 
-#: src/proto.c:143
+#: src/guestfs.c:344
 #, c-format
-msgid "guestfs_set_busy: called when in state %d != READY"
+msgid "warning: %s"
 msgstr ""
 
-#: src/proto.c:166
+#: src/guestfs.c:405
 #, c-format
-msgid "guestfs_end_busy: called when in state %d"
+msgid "libguestfs: error: %s\n"
 msgstr ""
 
-#: src/proto.c:281
+#: src/guestfs.c:983
 #, c-format
-msgid ""
-"check_for_daemon_cancellation_or_eof: read 0x%x from daemon, expected 0x%x\n"
+msgid "<truncated, original size %zu bytes>"
 msgstr ""
 
-#: src/proto.c:453 src/proto.c:514
-msgid "unexpected end of file when reading from daemon"
+#: src/inspect.c:293
+msgid "not a Windows guest, or systemroot could not be determined"
 msgstr ""
 
-#: src/proto.c:474
-#, c-format
-msgid "received magic signature from guestfsd, but in state %d"
+#: src/inspect.c:309
+msgid "not a Windows guest, or CurrentControlSet could not be determined"
 msgstr ""
 
-#: src/proto.c:491
-#, c-format
-msgid "message length (%u) > maximum possible size (%d)"
+#: 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:641
+#: 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 "guestfs___send: state %d != BUSY"
-msgstr ""
-
-#: src/proto.c:663
-msgid "xdr_guestfs_message_header failed"
+msgid "size of %s is unreasonably large (%<PRIi64> bytes)"
 msgstr ""
 
-#: src/proto.c:672
-msgid "dispatch failed to marshal args"
+#: src/inspect.c:788
+msgid "no inspection data: call guestfs_inspect_os first"
 msgstr ""
 
-#: src/proto.c:802
+#: src/inspect.c:800
 #, c-format
-msgid "send_file_chunk: state %d != READY"
+msgid ""
+"%s: root device not found: only call this function with a root device "
+"previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/proto.c:818
+#: src/inspect_fs.c:346 src/inspect_fs.c:359
 #, c-format
-msgid "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"
+msgid "could not parse integer in version number: %s"
 msgstr ""
 
-#: src/proto.c:941
+#: src/inspect_fs.c:512
 #, c-format
-msgid "%s: error in chunked encoding"
+msgid "%s: file is empty"
 msgstr ""
 
-#: src/proto.c:969
-msgid "write to daemon socket"
-msgstr ""
-
-#: src/proto.c:992
-msgid "receive_file_data: parse error in reply callback"
+#: src/inspect_fs_unix.c:771
+msgid "could not parse /etc/fstab or empty file"
 msgstr ""
 
-#: src/proto.c:997
-msgid "receive_file_data: unexpected flag received when reading file chunks"
-msgstr ""
-
-#: src/proto.c:1005
-msgid "failed to parse file chunk"
-msgstr ""
-
-#: src/proto.c:1014
-msgid "file receive cancelled by daemon"
-msgstr ""
-
-#: test-tool/test-tool.c:82
+#: src/inspect_fs_windows.c:164
 #, 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"
+msgid "cannot resolve Windows %%SYSTEMROOT%%"
 msgstr ""
 
-#: test-tool/test-tool.c:138
+#: src/inspect_icon.c:492
 #, c-format
-msgid "libguestfs-test-tool: unknown long option: %s (%d)\n"
+msgid "read: %s: unexpected end of file"
 msgstr ""
 
-#: test-tool/test-tool.c:147
-#, c-format
-msgid "libguestfs-test-tool: invalid timeout: %s\n"
+#: src/launch.c:134
+msgid "command line cannot be altered after qemu subprocess launched"
 msgstr ""
 
-#: test-tool/test-tool.c:159
-#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#: src/launch.c:203
+msgid "guestfs_config: parameter must begin with '-' character"
 msgstr ""
 
-#: test-tool/test-tool.c:182
+#: src/launch.c:217
 #, c-format
-msgid "libguestfs-test-tool: failed to create libguestfs handle\n"
+msgid "guestfs_config: parameter '%s' isn't allowed"
 msgstr ""
 
-#: test-tool/test-tool.c:189 test-tool/test-tool.c:198
-#, c-format
-msgid "libguestfs-test-tool: failed to add drive '%s'\n"
+#: src/launch.c:289 src/launch.c:407
+msgid "filename cannot contain ',' (comma) character"
 msgstr ""
 
-#: test-tool/test-tool.c:206
+#: src/launch.c:303 src/launch.c:311
 #, c-format
-msgid "libguestfs-test-tool: guestfs_version failed\n"
+msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: test-tool/test-tool.c:228
-#, c-format
-msgid "libguestfs-test-tool: failed to launch appliance\n"
+#: src/launch.c:426
+msgid "the libguestfs handle has already been launched"
 msgstr ""
 
-#: test-tool/test-tool.c:240
+#: src/launch.c:437
 #, c-format
-msgid "libguestfs-test-tool: failed to run sfdisk\n"
+msgid "%s: cannot create temporary directory"
 msgstr ""
 
-#: test-tool/test-tool.c:246
-#, c-format
-msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
+#: src/launch.c:474
+msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: test-tool/test-tool.c:252
-#, c-format
-msgid "libguestfs-test-tool: failed to mount /dev/sda1 on /\n"
+#: src/launch.c:895
+msgid "guestfs_launch failed, see earlier error messages"
 msgstr ""
 
-#: test-tool/test-tool.c:258
-#, c-format
-msgid "libguestfs-test-tool: failed to mkdir /iso\n"
+#: src/launch.c:908
+msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: test-tool/test-tool.c:264
-#, c-format
-msgid "libguestfs-test-tool: failed to mount /dev/sdb on /iso\n"
+#: src/launch.c:998
+msgid "guestfs_launch failed, unexpected initial message from guestfsd"
 msgstr ""
 
-#: test-tool/test-tool.c:272
-#, c-format
-msgid "libguestfs-test-tool: could not run helper program, or helper failed\n"
+#: src/launch.c:1006
+msgid "contacted guestfsd, but state != READY"
 msgstr ""
 
-#: test-tool/test-tool.c:303
+#: src/launch.c:1178
 #, c-format
 msgid ""
-"LIBGUESTFS_QEMU environment variable is already set, so\n"
-"--qemu/--qemudir options cannot be used.\n"
+"command failed: %s\n"
+"\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:311
-#, c-format
-msgid "Binary '%s' does not exist or is not executable\n"
+#: src/launch.c:1318
+msgid "qemu has not been launched yet"
 msgstr ""
 
-#: test-tool/test-tool.c:325
-#, c-format
-msgid "%s: does not look like a qemu source directory\n"
+#: src/launch.c:1329
+msgid "no subprocess to kill"
 msgstr ""
 
-#: test-tool/test-tool.c:374
+#: src/proto.c:188
 #, c-format
-msgid ""
-"Test tool helper program 'libguestfs-test-tool-helper' is not\n"
-"available.  Expected to find it in '%s'\n"
-"\n"
-"Use the --helper option to specify the location of this program.\n"
+msgid "guestfs_set_busy: called when in state %d != READY"
 msgstr ""
 
-#: test-tool/test-tool.c:390
+#: src/proto.c:211
 #, c-format
-msgid "command failed: %s"
+msgid "guestfs_end_busy: called when in state %d"
 msgstr ""
 
-#: test-tool/test-tool.c:398
+#: src/proto.c:421
 #, c-format
 msgid ""
-"Test tool helper program %s\n"
-"is not statically linked.  This is a build error when this test tool\n"
-"was built.\n"
-msgstr ""
-
-#: test-tool/test-tool.c:432
-#, c-format
-msgid "mkisofs command failed: %s\n"
+"check_for_daemon_cancellation_or_eof: read 0x%x from daemon, expected 0x%x\n"
 msgstr ""
 
-#: tools/virt-cat.pl:145
-msgid "virt-cat: no image, VM names or filenames to cat given"
+#: 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-cat.pl:165 tools/virt-edit.pl:189 tools/virt-ls.pl:198
-#: tools/virt-tar.pl:242 tools/virt-win-reg.pl:296
-#, perl-brace-format
-msgid "{prog}: multiboot operating systems are not supported.\n"
+#: src/proto.c:549
+msgid "See earlier debug messages.\n"
 msgstr ""
 
-#: tools/virt-df.pl:213
-msgid "virt-df: cannot use -h and --csv options together\n"
+#: src/proto.c:639
+#, c-format
+msgid "received magic signature from guestfsd, but in state %d"
 msgstr ""
 
-#: tools/virt-df.pl:277
-#, perl-brace-format
-msgid "{name} is not the name of a libvirt domain\n"
+#: src/proto.c:658
+#, c-format
+msgid "message length (%u) > maximum possible size (%d)"
 msgstr ""
 
-#: tools/virt-df.pl:345
-#, perl-brace-format
-msgid "virt-df: ignoring {name}, it has too many disks ({c} > {max})"
+#: src/proto.c:810
+#, c-format
+msgid "guestfs___send: state %d != BUSY"
 msgstr ""
 
-#: tools/virt-df.pl:521
-msgid "Virtual Machine"
+#: src/proto.c:834
+msgid "xdr_guestfs_message_header failed"
 msgstr ""
 
-#: tools/virt-df.pl:521
-msgid "Filesystem"
+#: src/proto.c:843
+msgid "dispatch failed to marshal args"
 msgstr ""
 
-#: tools/virt-df.pl:524
-msgid "1K-blocks"
+#: src/proto.c:922 src/proto.c:1218
+msgid "operation cancelled by user"
 msgstr ""
 
-#: tools/virt-df.pl:526
-msgid "Size"
+#: src/proto.c:973
+#, c-format
+msgid "send_file_chunk: state %d != READY"
 msgstr ""
 
-#: tools/virt-df.pl:528
-msgid "Used"
+#: src/proto.c:989
+#, c-format
+msgid "xdr_guestfs_chunk failed (buf = %p, buflen = %zu)"
 msgstr ""
 
-#: tools/virt-df.pl:529
-msgid "Available"
+#: src/proto.c:1145
+#, c-format
+msgid "%s: error in chunked encoding"
 msgstr ""
 
-#: tools/virt-df.pl:530
-msgid "Use%"
+#: src/proto.c:1172
+msgid "write to daemon socket"
 msgstr ""
 
-#: tools/virt-df.pl:532
-msgid "Inodes"
+#: src/proto.c:1195
+msgid "receive_file_data: parse error in reply callback"
 msgstr ""
 
-#: tools/virt-df.pl:533
-msgid "IUsed"
+#: src/proto.c:1200
+msgid "receive_file_data: unexpected flag received when reading file chunks"
 msgstr ""
 
-#: tools/virt-df.pl:534
-msgid "IFree"
+#: src/proto.c:1208
+msgid "failed to parse file chunk"
 msgstr ""
 
-#: tools/virt-df.pl:535
-msgid "IUse%"
+#: src/proto.c:1222
+msgid "file receive cancelled by daemon"
 msgstr ""
 
-#: tools/virt-edit.pl:169
-msgid "virt-edit: no image, VM names or filenames to edit given"
+#: src/virt.c:106 src/virt.c:400
+msgid "you cannot set both live and readonly flags"
 msgstr ""
 
-#: tools/virt-edit.pl:221
-msgid "File not changed.\n"
+#: src/virt.c:114
+#, c-format
+msgid "could not connect to libvirt (code %d, domain %d): %s"
 msgstr ""
 
-#: tools/virt-list-filesystems.pl:139
-msgid "virt-list-filesystems: no image or VM name given"
+#: src/virt.c:135
+#, c-format
+msgid "no libvirt domain called '%s': %s"
 msgstr ""
 
-#: tools/virt-list-partitions.pl:149
-msgid "virt-list-partitions: no image or VM name given"
+#: src/virt.c:195 src/virt.c:523
+#, c-format
+msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: tools/virt-ls.pl:153 tools/virt-ls.pl:159
-msgid "virt-ls: cannot combine -l and -R options\n"
+#: src/virt.c:205 src/virt.c:531
+msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: tools/virt-ls.pl:178
-msgid "virt-ls: no image, VM names or directory to list given"
+#: 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"
+"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:437
-msgid "tar: failed, see earlier messages\n"
-msgstr ""
-
-#: tools/virt-make-fs.pl:459
-msgid "uncompress command failed, see earlier messages\n"
-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:222
-msgid "virt-rescue: no image or VM names rescue given"
+"%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
+"\"error\""
 msgstr ""
 
-#: tools/virt-resize.pl:33
-msgid "virt-resize: sorry this program does not work on a 32 bit host\n"
-msgstr ""
-
-#: tools/virt-resize.pl:584
-#, perl-brace-format
-msgid "virt-resize: {file}: does not exist or is not readable\n"
-msgstr ""
-
-#: tools/virt-resize.pl:586
-#, perl-brace-format
+#: src/virt.c:580
 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"
+"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:665 tools/virt-resize.pl:668
-#, perl-brace-format
+#: src/virt.c:605
 msgid ""
-"virt-resize: {file}: file is too small to be a disk image ({sz} bytes)\n"
+"add-domain API not available since this version of libguestfs was compiled "
+"without libvirt or libxml2"
 msgstr ""
 
-#: tools/virt-resize.pl:684 tools/virt-resize.pl:696
-msgid "virt-resize: short read"
+#: test-tool/test-tool.c:79
+#, c-format
+msgid ""
+"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:830
-#, 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:850
-#, 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:856
-#, 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:860
-#, 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:902
-#, 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:910
-#, 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:927
-#, 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:932
-#, 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:955
-#, perl-brace-format
-msgid ""
-"{p}: cannot make this partition smaller because it contains a\n"
-"filesystem, physical volume or other content that is larger than the new "
-"size.\n"
-"You have to resize the content first, see virt-resize(1).\n"
+#: test-tool/test-tool.c:242
+#, c-format
+msgid "libguestfs-test-tool: failed to mkfs.ext2\n"
 msgstr ""
 
-#: tools/virt-resize.pl:971
-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:1020
-#, perl-brace-format
-msgid ""
-"virt-resize: error: cannot use --expand when there is no surplus space to\n"
-"expand into.  You need to make the target disk larger by at least {h}.\n"
+#: test-tool/test-tool.c:255
+#, c-format
+msgid "libguestfs-test-tool: failed to touch file\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1035
+#: 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:1050
-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:1054
-#, 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:1056
-#, 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:1058
-#, 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:1063
-#, 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:1068
-#, 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:1073
-#, 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:1079
+#: 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:1086
+#: tools/virt-make-fs.pl:393
 #, perl-brace-format
-msgid "There is a surplus of {spl} bytes ({h}).\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1091
-msgid "An extra partition will be created for the surplus.\n"
-msgstr ""
-
-#: tools/virt-resize.pl:1093
-msgid ""
-"The surplus space is not large enough for an extra partition to be created\n"
-"and so it will just be ignored.\n"
+msgid "virt-make-fs: cannot parse size parameter: {sz}\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1096
+#: 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:1099
-#, perl-brace-format
-msgid ""
-"virt-resize: error: there is a deficit of {def} bytes ({h}).\n"
-"You need to make the target disk larger by at least this amount,\n"
-"or adjust your resizing requests.\n"
+#: tools/virt-make-fs.pl:419
+msgid "virt-make-fs: NTFS support was disabled when libguestfs was compiled\n"
 msgstr ""
 
-#: tools/virt-resize.pl:1116
-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:1211
-#, 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:1274 tools/virt-resize.pl:1332
-#, 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:178 tools/virt-tar.pl:185
+#: 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:207
+#: tools/virt-tar.pl:222
 msgid "virt-tar: no image, VM names, directory or filename given"
 msgstr ""
 
-#: tools/virt-tar.pl:210
+#: 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:221
+#: tools/virt-tar.pl:236
 #, perl-brace-format
 msgid "virt-tar: {tarball}: file not found\n"
 msgstr ""
 
-#: tools/virt-tar.pl:224
+#: tools/virt-tar.pl:239
 #, perl-brace-format
 msgid "virt-tar: {dir}: directory name must start with '/' character\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:276
+#: 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-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:245
 msgid "no libvirt domain name or disk image given\n"
 msgstr ""
 
-#: tools/virt-win-reg.pl:315
+#: 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:426
+#: 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:443 tools/virt-win-reg.pl:465
+#: 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:450
+#: 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:472
+#: tools/virt-win-reg.pl:551
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""