aboutsummaryrefslogtreecommitdiffhomepage
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/completions/apm.fish14
-rw-r--r--share/completions/apropos.fish22
-rw-r--r--share/completions/apt-build.fish54
-rw-r--r--share/completions/apt-cache.fish58
-rw-r--r--share/completions/apt-cdrom.fish24
-rw-r--r--share/completions/apt-config.fish12
-rw-r--r--share/completions/apt-extracttemplates.fish8
-rw-r--r--share/completions/apt-file.fish32
-rw-r--r--share/completions/apt-ftparchive.fish32
-rw-r--r--share/completions/apt-get.fish88
-rw-r--r--share/completions/apt-key.fish6
-rw-r--r--share/completions/apt-listbugs.fish46
-rw-r--r--share/completions/apt-listchanges.fish24
-rw-r--r--share/completions/apt-move.fish38
-rw-r--r--share/completions/apt-proxy-import.fish16
-rw-r--r--share/completions/apt-rdepends.fish22
-rw-r--r--share/completions/apt-setup.fish4
-rw-r--r--share/completions/apt-show-source.fish18
-rw-r--r--share/completions/apt-show-versions.fish24
-rw-r--r--share/completions/apt-sortpkgs.fish10
-rw-r--r--share/completions/apt-spy.fish34
-rw-r--r--share/completions/apt-src.fish46
-rw-r--r--share/completions/apt-zip-inst.fish14
-rw-r--r--share/completions/apt-zip-list.fish22
-rw-r--r--share/completions/arp.fish18
-rw-r--r--share/completions/at.fish16
-rw-r--r--share/completions/atd.fish8
-rw-r--r--share/completions/atq.fish4
-rw-r--r--share/completions/atrm.fish2
-rw-r--r--share/completions/bc.fish14
-rw-r--r--share/completions/bunzip2.fish14
-rw-r--r--share/completions/bzcat.fish2
-rw-r--r--share/completions/bzip2.fish24
-rw-r--r--share/completions/cat.fish22
-rw-r--r--share/completions/cdrecord.fish158
-rw-r--r--share/completions/chgrp.fish20
-rw-r--r--share/completions/chown.fish24
-rw-r--r--share/completions/commandline.fish24
-rw-r--r--share/completions/complete.fish30
-rw-r--r--share/completions/configure.fish24
-rw-r--r--share/completions/cp.fish56
-rw-r--r--share/completions/cut.fish18
-rw-r--r--share/completions/cvs.fish226
-rw-r--r--share/completions/darcs.fish320
-rw-r--r--share/completions/date.fish20
-rw-r--r--share/completions/dcop.fish14
-rw-r--r--share/completions/df.fish38
-rw-r--r--share/completions/diff.fish50
-rw-r--r--share/completions/du.fish38
-rw-r--r--share/completions/echo.fish10
-rw-r--r--share/completions/emacs.fish14
-rw-r--r--share/completions/emerge.fish6
-rw-r--r--share/completions/env.fish12
-rw-r--r--share/completions/equery.fish6
-rw-r--r--share/completions/find.fish140
-rw-r--r--share/completions/fish.fish14
-rw-r--r--share/completions/function.fish16
-rw-r--r--share/completions/functions.fish14
-rw-r--r--share/completions/fusermount.fish14
-rw-r--r--share/completions/gcc.fish114
-rw-r--r--share/completions/gem.fish192
-rw-r--r--share/completions/gpg.fish390
-rw-r--r--share/completions/gprof.fish66
-rw-r--r--share/completions/grep.fish84
-rw-r--r--share/completions/gunzip.fish26
-rw-r--r--share/completions/gzip.fish30
-rw-r--r--share/completions/help.fish36
-rw-r--r--share/completions/iconv.fish14
-rw-r--r--share/completions/id.fish14
-rw-r--r--share/completions/ifconfig.fish6
-rw-r--r--share/completions/jobs.fish8
-rw-r--r--share/completions/kill.fish4
-rw-r--r--share/completions/less.fish100
-rw-r--r--share/completions/locate.fish36
-rw-r--r--share/completions/make.fish42
-rw-r--r--share/completions/makedepend.fish24
-rw-r--r--share/completions/man.fish62
-rw-r--r--share/completions/mimedb.fish18
-rw-r--r--share/completions/modprobe.fish40
-rw-r--r--share/completions/mount.fish38
-rw-r--r--share/completions/mplayer.fish70
-rw-r--r--share/completions/mv.fish22
-rw-r--r--share/completions/nextd.fish2
-rw-r--r--share/completions/nice.fish8
-rw-r--r--share/completions/patch.fish72
-rw-r--r--share/completions/perl.fish38
-rw-r--r--share/completions/pine.fish34
-rw-r--r--share/completions/ping.fish56
-rw-r--r--share/completions/prevd.fish2
-rw-r--r--share/completions/ps.fish64
-rw-r--r--share/completions/psub.fish4
-rw-r--r--share/completions/python.fish28
-rw-r--r--share/completions/read.fish16
-rw-r--r--share/completions/renice.fish6
-rw-r--r--share/completions/rm.fish16
-rw-r--r--share/completions/rmdir.fish10
-rw-r--r--share/completions/rpm.fish188
-rw-r--r--share/completions/ruby.fish46
-rw-r--r--share/completions/scp.fish14
-rw-r--r--share/completions/screen.fish2
-rw-r--r--share/completions/sed.fish30
-rw-r--r--share/completions/service.fish2
-rw-r--r--share/completions/set.fish22
-rw-r--r--share/completions/set_color.fish14
-rw-r--r--share/completions/sort.fish40
-rw-r--r--share/completions/ssh.fish44
-rw-r--r--share/completions/sshfs.fish20
-rw-r--r--share/completions/status.fish18
-rw-r--r--share/completions/su.fish14
-rw-r--r--share/completions/sudo.fish6
-rw-r--r--share/completions/svn.fish74
-rw-r--r--share/completions/tar.fish122
-rw-r--r--share/completions/test.fish74
-rw-r--r--share/completions/time.fish16
-rw-r--r--share/completions/top.fish24
-rw-r--r--share/completions/touch.fish22
-rw-r--r--share/completions/trap.fish6
-rw-r--r--share/completions/type.fish16
-rw-r--r--share/completions/ulimit.fish30
-rw-r--r--share/completions/umount.fish26
-rw-r--r--share/completions/uname.fish22
-rw-r--r--share/completions/uniq.fish20
-rw-r--r--share/completions/valgrind.fish70
-rw-r--r--share/completions/vared.fish2
-rw-r--r--share/completions/w.fish12
-rw-r--r--share/completions/wajig.fish16
-rw-r--r--share/completions/wc.fish14
-rw-r--r--share/completions/wget.fish174
-rw-r--r--share/completions/which.fish24
-rw-r--r--share/completions/who.fish38
-rw-r--r--share/completions/wpa_cli.fish74
-rw-r--r--share/completions/xargs.fish32
-rw-r--r--share/completions/xmms.fish22
-rw-r--r--share/completions/xpdf.fish62
-rw-r--r--share/completions/xprop.fish28
-rw-r--r--share/completions/xsel.fish36
-rw-r--r--share/completions/yum.fish30
-rw-r--r--share/completions/zcat.fish8
-rw-r--r--share/completions/zip.fish60
-rw-r--r--share/functions/N_.fish2
-rw-r--r--share/functions/__fish_complete_bittorrent.fish58
-rw-r--r--share/functions/__fish_complete_ls.fish134
-rw-r--r--share/functions/__fish_complete_ssh.fish20
-rw-r--r--share/functions/__fish_complete_tex.fish4
144 files changed, 2863 insertions, 2859 deletions
diff --git a/share/completions/apm.fish b/share/completions/apm.fish
index 01071325..2817e615 100644
--- a/share/completions/apm.fish
+++ b/share/completions/apm.fish
@@ -1,8 +1,8 @@
#apm
-complete -f -c apm -s V -l version -d (N_ "Display version and exit")
-complete -f -c apm -s v -l verbose -d (N_ "Print APM info")
-complete -f -c apm -s m -l minutes -d (N_ "Print time remaining")
-complete -f -c apm -s M -l monitor -d (N_ "Monitor status info")
-complete -f -c apm -s S -l standby -d (N_ "Request APM standby mode")
-complete -f -c apm -s s -l suspend -d (N_ "Request APM suspend mode")
-complete -f -c apm -s d -l debug -d (N_ "APM status debugging info")
+complete -f -c apm -s V -l version --description "Display version and exit"
+complete -f -c apm -s v -l verbose --description "Print APM info"
+complete -f -c apm -s m -l minutes --description "Print time remaining"
+complete -f -c apm -s M -l monitor --description "Monitor status info"
+complete -f -c apm -s S -l standby --description "Request APM standby mode"
+complete -f -c apm -s s -l suspend --description "Request APM suspend mode"
+complete -f -c apm -s d -l debug --description "APM status debugging info"
diff --git a/share/completions/apropos.fish b/share/completions/apropos.fish
index 67e8f84a..5fe4b9f1 100644
--- a/share/completions/apropos.fish
+++ b/share/completions/apropos.fish
@@ -6,16 +6,16 @@ function __fish_complete_apropos
end
end
-complete -xc apropos -a '(__fish_complete_apropos)' -d (N_ "whatis entry")
+complete -xc apropos -a '(__fish_complete_apropos)' --description "whatis entry"
-complete -c apropos -s h -l help -d (N_ "Display help and exit")
-complete -f -c apropos -s d -l debug -d (N_ "Print debugging info")
-complete -f -c apropos -s v -l verbose -d (N_ "Verbose mode")
-complete -f -c apropos -s r -l regex -d (N_ "Keyword as regex")
-complete -f -c apropos -s w -l wildcard -d (N_ "Keyword as wildcards")
-complete -f -c apropos -s e -l exact -d (N_ "Keyword as exactly match")
-complete -x -c apropos -s m -l system -d (N_ "Search for other system")
-complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d (N_ "Specify man path")
-complete -x -c apropos -s C -l config-file -d (N_ "Specify a configuration file")
-complete -f -c apropos -s V -l version -d (N_ "Display version and exit")
+complete -c apropos -s h -l help --description "Display help and exit"
+complete -f -c apropos -s d -l debug --description "Print debugging info"
+complete -f -c apropos -s v -l verbose --description "Verbose mode"
+complete -f -c apropos -s r -l regex --description "Keyword as regex"
+complete -f -c apropos -s w -l wildcard --description "Keyword as wildcards"
+complete -f -c apropos -s e -l exact --description "Keyword as exactly match"
+complete -x -c apropos -s m -l system --description "Search for other system"
+complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' --description "Specify man path"
+complete -x -c apropos -s C -l config-file --description "Specify a configuration file"
+complete -f -c apropos -s V -l version --description "Display version and exit"
diff --git a/share/completions/apt-build.fish b/share/completions/apt-build.fish
index 9b1ea5e2..42a8cd3d 100644
--- a/share/completions/apt-build.fish
+++ b/share/completions/apt-build.fish
@@ -1,29 +1,29 @@
#apt-build
-complete -c apt-build -l help -d (N_ "Display help and exit")
-complete -f -c apt-build -a update -d (N_ "Update list of packages")
-complete -f -c apt-build -a upgrade -d (N_ "Upgrade packages")
-complete -f -c apt-bulid -a world -d (N_ "Rebuild your system")
-complete -x -c apt-build -a install -d (N_ "Build and install a new package")
-complete -x -c apt-build -a source -d (N_ "Download and extract a source")
-complete -x -c apt-build -a info -d (N_ "Info on a package")
-complete -x -c apt-build -a remove -d (N_ "Remove packages")
-complete -x -c apt-build -a clean-build -d (N_ "Erase built packages")
-complete -x -c apt-build -a build-source -d (N_ "Build source without install")
-complete -x -c apt-build -a clean-sources -d (N_ "Clean source directories")
-complete -x -c apt-build -a update-source -d (N_ "Update source and rebuild")
-complete -x -c apt-build -a update-repository -d (N_ "Update the repository")
-complete -f -c apt-build -l nowrapper -d (N_ "Do not use gcc wrapper")
-complete -f -c apt-build -l remove-builddep -d (N_ "Remove build-dep")
-complete -f -c apt-build -l no-source -d (N_ "Do not download source")
-complete -f -c apt-build -l build-dir -d (N_ "Specify build-dir")
-complete -f -c apt-build -l rebuild -d (N_ "Rebuild a package")
-complete -f -c apt-build -l reinstall -d (N_ "Rebuild and install an installed package")
-complete -r -f -c apt-build -l build-command -d (N_ "Use <command> to build")
-complete -r -c apt-build -l patch -d (N_ "Apply <file> patch")
-complete -c apt-build -s p -l patch-strip -d (N_ "Prefix to strip on patch")
-complete -c apt-build -s y -l yes -d (N_ "Assume yes to all questions")
-complete -c apt-build -l purge -d (N_ "Use purge instead of remove")
-complete -c apt-build -l noupdate -d (N_ "Do not run update")
-complete -r -c apt-build -l source-list -d (N_ "Specify sources.list file")
-complete -f -c apt-build -s v -l version -d (N_ "Display version and exit")
+complete -c apt-build -l help --description "Display help and exit"
+complete -f -c apt-build -a update --description "Update list of packages"
+complete -f -c apt-build -a upgrade --description "Upgrade packages"
+complete -f -c apt-bulid -a world --description "Rebuild your system"
+complete -x -c apt-build -a install --description "Build and install a new package"
+complete -x -c apt-build -a source --description "Download and extract a source"
+complete -x -c apt-build -a info --description "Info on a package"
+complete -x -c apt-build -a remove --description "Remove packages"
+complete -x -c apt-build -a clean-build --description "Erase built packages"
+complete -x -c apt-build -a build-source --description "Build source without install"
+complete -x -c apt-build -a clean-sources --description "Clean source directories"
+complete -x -c apt-build -a update-source --description "Update source and rebuild"
+complete -x -c apt-build -a update-repository --description "Update the repository"
+complete -f -c apt-build -l nowrapper --description "Do not use gcc wrapper"
+complete -f -c apt-build -l remove-builddep --description "Remove build-dep"
+complete -f -c apt-build -l no-source --description "Do not download source"
+complete -f -c apt-build -l build-dir --description "Specify build-dir"
+complete -f -c apt-build -l rebuild --description "Rebuild a package"
+complete -f -c apt-build -l reinstall --description "Rebuild and install an installed package"
+complete -r -f -c apt-build -l build-command --description "Use <command> to build"
+complete -r -c apt-build -l patch --description "Apply <file> patch"
+complete -c apt-build -s p -l patch-strip --description "Prefix to strip on patch"
+complete -c apt-build -s y -l yes --description "Assume yes to all questions"
+complete -c apt-build -l purge --description "Use purge instead of remove"
+complete -c apt-build -l noupdate --description "Do not run update"
+complete -r -c apt-build -l source-list --description "Specify sources.list file"
+complete -f -c apt-build -s v -l version --description "Display version and exit"
diff --git a/share/completions/apt-cache.fish b/share/completions/apt-cache.fish
index 66011d67..38432484 100644
--- a/share/completions/apt-cache.fish
+++ b/share/completions/apt-cache.fish
@@ -1,31 +1,31 @@
#apt-cache
-complete -c apt-cache -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-cache -a gencaches -d (N_ "Build apt cache")
-complete -x -c apt-cache -a showpkg -d (N_ "Show package info")
-complete -f -c apt-cache -a stats -d (N_ "Show cache statistics")
-complete -x -c apt-cache -a showsrc -d (N_ "Show source package")
-complete -f -c apt-cache -a dump -d (N_ "Show packages in cache")
-complete -f -c apt-cache -a dumpavail -d (N_ "Print available list")
-complete -f -c apt-cache -a unmet -d (N_ "List unmet dependencies in cache")
-complete -x -c apt-cache -a show -d (N_ "Display package record")
-complete -x -c apt-cache -a search -d (N_ "Search packagename by REGEX")
-complete -c apt-cache -l full -a search -d (N_ "Search full package name")
-complete -x -c apt-cache -l names-only -a search -d (N_ "Search packagename only")
-complete -x -c apt-cache -a depends -d (N_ "List dependencies for the package")
-complete -x -c apt-cache -a rdepends -d (N_ "List reverse dependencies for the package")
-complete -x -c apt-cache -a pkgnames -d (N_ "Print package name by prefix")
-complete -x -c apt-cache -a dotty -d (N_ "Generate dotty output for packages")
-complete -x -c apt-cache -a policy -d (N_ "Debug preferences file")
-complete -r -c apt-cache -s p -l pkg-cache -d (N_ "Select file to store package cache")
-complete -r -c apt-cache -s s -l src-cache -d (N_ "Select file to store source cache")
-complete -f -c apt-cache -s q -l quiet -d (N_ "Quiet mode")
-complete -f -c apt-cache -s i -l important -d (N_ "Print important dependencies")
-complete -f -c apt-cache -s a -l all-versions -d (N_ "Print full records")
-complete -f -c apt-cache -s g -l generate -d (N_ "Auto-gen package cache")
-complete -f -c apt-cache -l all-names -d (N_ "Print all names")
-complete -f -c apt-cache -l recurse -d (N_ "Dep and rdep recursive")
-complete -f -c apt-cache -l installed -d (N_ "Limit to installed")
-complete -f -c apt-cache -s v -l version -d (N_ "Display version and exit")
-complete -r -c apt-cache -s c -l config-file -d (N_ "Specify config file")
-complete -x -c apt-cache -s o -l option -d (N_ "Specify options")
+complete -c apt-cache -s h -l help --description "Display help and exit"
+complete -f -c apt-cache -a gencaches --description "Build apt cache"
+complete -x -c apt-cache -a showpkg --description "Show package info"
+complete -f -c apt-cache -a stats --description "Show cache statistics"
+complete -x -c apt-cache -a showsrc --description "Show source package"
+complete -f -c apt-cache -a dump --description "Show packages in cache"
+complete -f -c apt-cache -a dumpavail --description "Print available list"
+complete -f -c apt-cache -a unmet --description "List unmet dependencies in cache"
+complete -x -c apt-cache -a show --description "Display package record"
+complete -x -c apt-cache -a search --description "Search packagename by REGEX"
+complete -c apt-cache -l full -a search --description "Search full package name"
+complete -x -c apt-cache -l names-only -a search --description "Search packagename only"
+complete -x -c apt-cache -a depends --description "List dependencies for the package"
+complete -x -c apt-cache -a rdepends --description "List reverse dependencies for the package"
+complete -x -c apt-cache -a pkgnames --description "Print package name by prefix"
+complete -x -c apt-cache -a dotty --description "Generate dotty output for packages"
+complete -x -c apt-cache -a policy --description "Debug preferences file"
+complete -r -c apt-cache -s p -l pkg-cache --description "Select file to store package cache"
+complete -r -c apt-cache -s s -l src-cache --description "Select file to store source cache"
+complete -f -c apt-cache -s q -l quiet --description "Quiet mode"
+complete -f -c apt-cache -s i -l important --description "Print important dependencies"
+complete -f -c apt-cache -s a -l all-versions --description "Print full records"
+complete -f -c apt-cache -s g -l generate --description "Auto-gen package cache"
+complete -f -c apt-cache -l all-names --description "Print all names"
+complete -f -c apt-cache -l recurse --description "Dep and rdep recursive"
+complete -f -c apt-cache -l installed --description "Limit to installed"
+complete -f -c apt-cache -s v -l version --description "Display version and exit"
+complete -r -c apt-cache -s c -l config-file --description "Specify config file"
+complete -x -c apt-cache -s o -l option --description "Specify options"
diff --git a/share/completions/apt-cdrom.fish b/share/completions/apt-cdrom.fish
index 4105e922..cb1a351d 100644
--- a/share/completions/apt-cdrom.fish
+++ b/share/completions/apt-cdrom.fish
@@ -1,13 +1,13 @@
#apt-cdrom
-complete -c apt-cdrom -s h -l help -d (N_ "Display help and exit")
-complete -r -c apt-cdrom -a add -d (N_ "Add new disc to source list")
-complete -x -c apt-cdrom -a ident -d (N_ "Report identity of disc")
-complete -r -c apt-cdrom -s d -l cdrom -d (N_ "Mount point")
-complete -f -c apt-cdrom -s r -l rename -d (N_ "Rename a disc")
-complete -f -c apt-cdrom -s m -l no-mount -d (N_ "No mounting")
-complete -f -c apt-cdrom -s f -l fast -d (N_ "Fast copy")
-complete -f -c apt-cdrom -s a -l thorough -d (N_ "Thorough package scan")
-complete -f -c apt-cdrom -s n -l no-act -d (N_ "No changes")
-complete -f -c apt-cdrom -s v -l version -d (N_ "Display version and exit")
-complete -r -c apt-cdrom -s c -l config-file -d (N_ "Specify config file")
-complete -x -c apt-cdrom -s o -l option -d (N_ "Specify options")
+complete -c apt-cdrom -s h -l help --description "Display help and exit"
+complete -r -c apt-cdrom -a add --description "Add new disc to source list"
+complete -x -c apt-cdrom -a ident --description "Report identity of disc"
+complete -r -c apt-cdrom -s d -l cdrom --description "Mount point"
+complete -f -c apt-cdrom -s r -l rename --description "Rename a disc"
+complete -f -c apt-cdrom -s m -l no-mount --description "No mounting"
+complete -f -c apt-cdrom -s f -l fast --description "Fast copy"
+complete -f -c apt-cdrom -s a -l thorough --description "Thorough package scan"
+complete -f -c apt-cdrom -s n -l no-act --description "No changes"
+complete -f -c apt-cdrom -s v -l version --description "Display version and exit"
+complete -r -c apt-cdrom -s c -l config-file --description "Specify config file"
+complete -x -c apt-cdrom -s o -l option --description "Specify options"
diff --git a/share/completions/apt-config.fish b/share/completions/apt-config.fish
index 157b2ece..13db66c9 100644
--- a/share/completions/apt-config.fish
+++ b/share/completions/apt-config.fish
@@ -1,7 +1,7 @@
#apt-config
-complete -c apt-config -s h -l help -d (N_ "Display help and exit")
-complete -c apt-config -a shell -d (N_ "Access config file from shell")
-complete -f -c apt-config -a dump -d (N_ "Dump contents of config file")
-complete -f -c apt-config -s v -l version -d (N_ "Display version and exit")
-complete -r -c apt-config -s c -l config-file -d (N_ "Specify config file")
-complete -x -c apt-config -s o -l option -d (N_ "Specify options")
+complete -c apt-config -s h -l help --description "Display help and exit"
+complete -c apt-config -a shell --description "Access config file from shell"
+complete -f -c apt-config -a dump --description "Dump contents of config file"
+complete -f -c apt-config -s v -l version --description "Display version and exit"
+complete -r -c apt-config -s c -l config-file --description "Specify config file"
+complete -x -c apt-config -s o -l option --description "Specify options"
diff --git a/share/completions/apt-extracttemplates.fish b/share/completions/apt-extracttemplates.fish
index f00e49bf..cab30a54 100644
--- a/share/completions/apt-extracttemplates.fish
+++ b/share/completions/apt-extracttemplates.fish
@@ -1,7 +1,7 @@
#apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d (N_ "Display help and exit")
-complete -r -c apt-extracttemplates -s t -d (N_ "Set temp dir")
-complete -r -c apt-extracttemplates -s c -d (N_ "Specifiy config file")
-complete -r -c apt-extracttemplates -s o -d (N_ "Specify options")
+complete -c apt-extracttemplates -s h -l help --description "Display help and exit"
+complete -r -c apt-extracttemplates -s t --description "Set temp dir"
+complete -r -c apt-extracttemplates -s c --description "Specifiy config file"
+complete -r -c apt-extracttemplates -s o --description "Specify options"
diff --git a/share/completions/apt-file.fish b/share/completions/apt-file.fish
index ca4a5df0..ee97cf52 100644
--- a/share/completions/apt-file.fish
+++ b/share/completions/apt-file.fish
@@ -1,17 +1,17 @@
#apt-file
-complete -c apt-file -s h -l help -d (N_ "Display help and exit")
-complete -x -c apt-file -a update -d (N_ "Resync package contents from source")
-complete -r -c apt-file -a search -d (N_ "Search package containing pattern")
-complete -r -c apt-file -a list -d (N_ "List contents of a package matching pattern")
-complete -x -c apt-file -a purge -d (N_ "Remove all gz files from cache")
-complete -r -c apt-file -s c -l cache -d (N_ "Set cache dir")
-complete -f -c apt-file -s v -l verbose -d (N_ "Verbose mode")
-complete -c apt-file -s d -l cdrom-mount -d (N_ "Use cdrom-mount-point")
-complete -f -c apt-file -s i -l ignore-case -d (N_ "Do not expand pattern")
-complete -f -c apt-file -s x -l regexp -d (N_ "Pattern is regexp")
-complete -f -c apt-file -s V -l version -d (N_ "Display version and exit")
-complete -f -c apt-file -s a -l architecture -d (N_ "Set arch")
-complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d (N_ "Set sources.list file")
-complete -f -c apt-file -s l -l package-only -d (N_ "Only display package name")
-complete -f -c apt-file -s F -l fixed-string -d (N_ "Do not expand pattern")
-complete -f -c apt-file -s y -l dummy -d (N_ "Run in dummy mode")
+complete -c apt-file -s h -l help --description "Display help and exit"
+complete -x -c apt-file -a update --description "Resync package contents from source"
+complete -r -c apt-file -a search --description "Search package containing pattern"
+complete -r -c apt-file -a list --description "List contents of a package matching pattern"
+complete -x -c apt-file -a purge --description "Remove all gz files from cache"
+complete -r -c apt-file -s c -l cache --description "Set cache dir"
+complete -f -c apt-file -s v -l verbose --description "Verbose mode"
+complete -c apt-file -s d -l cdrom-mount --description "Use cdrom-mount-point"
+complete -f -c apt-file -s i -l ignore-case --description "Do not expand pattern"
+complete -f -c apt-file -s x -l regexp --description "Pattern is regexp"
+complete -f -c apt-file -s V -l version --description "Display version and exit"
+complete -f -c apt-file -s a -l architecture --description "Set arch"
+complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" --description "Set sources.list file"
+complete -f -c apt-file -s l -l package-only --description "Only display package name"
+complete -f -c apt-file -s F -l fixed-string --description "Do not expand pattern"
+complete -f -c apt-file -s y -l dummy --description "Run in dummy mode"
diff --git a/share/completions/apt-ftparchive.fish b/share/completions/apt-ftparchive.fish
index e741b96c..002f58f7 100644
--- a/share/completions/apt-ftparchive.fish
+++ b/share/completions/apt-ftparchive.fish
@@ -1,17 +1,17 @@
#apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-ftparchive -a packages -d (N_ "Generate package from source")
-complete -f -c apt-ftparchive -a sources -d (N_ "Generate source index file")
-complete -f -c apt-ftparchive -a contents -d (N_ "Generate contents file")
-complete -f -c apt-ftparchive -a release -d (N_ "Generate release file")
-complete -f -c apt-ftparchive -a clean -d (N_ "Remove records")
-complete -f -c apt-ftparchive -l md5 -d (N_ "Generate MD5 sums")
-complete -f -c apt-ftparchive -s d -l db -d (N_ "Use a binary db")
-complete -f -c apt-ftparchive -s q -l quiet -d (N_ "Quiet mode")
-complete -f -c apt-ftparchive -l delink -d (N_ "Perform delinking")
-complete -f -c apt-ftparchive -l contents -d (N_ "Perform contents generation")
-complete -c apt-ftparchive -s s -l source-override -d (N_ "Use source override")
-complete -f -c apt-ftparchive -l readonly -d (N_ "Make caching db readonly")
-complete -f -c apt-ftparchive -s v -l version -d (N_ "Display version and exit")
-complete -r -c apt-ftparchive -s c -l config-file -d (N_ "Use config file")
-complete -r -c apt-ftparchive -s o -l option -d (N_ "Set config options")
+complete -c apt-ftparchive -s h -l help --description "Display help and exit"
+complete -f -c apt-ftparchive -a packages --description "Generate package from source"
+complete -f -c apt-ftparchive -a sources --description "Generate source index file"
+complete -f -c apt-ftparchive -a contents --description "Generate contents file"
+complete -f -c apt-ftparchive -a release --description "Generate release file"
+complete -f -c apt-ftparchive -a clean --description "Remove records"
+complete -f -c apt-ftparchive -l md5 --description "Generate MD5 sums"
+complete -f -c apt-ftparchive -s d -l db --description "Use a binary db"
+complete -f -c apt-ftparchive -s q -l quiet --description "Quiet mode"
+complete -f -c apt-ftparchive -l delink --description "Perform delinking"
+complete -f -c apt-ftparchive -l contents --description "Perform contents generation"
+complete -c apt-ftparchive -s s -l source-override --description "Use source override"
+complete -f -c apt-ftparchive -l readonly --description "Make caching db readonly"
+complete -f -c apt-ftparchive -s v -l version --description "Display version and exit"
+complete -r -c apt-ftparchive -s c -l config-file --description "Use config file"
+complete -r -c apt-ftparchive -s o -l option --description "Set config options"
diff --git a/share/completions/apt-get.fish b/share/completions/apt-get.fish
index a0e8621a..44bcdc54 100644
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -1,6 +1,6 @@
#completion for apt-get
-function __fish_apt_no_subcommand -d (N_ 'Test if apt has yet to be given the subcommand')
+function __fish_apt_no_subcommand --description 'Test if apt has yet to be given the subcommand'
for i in (commandline -opc)
if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove source build-dep check clean autoclean
return 1
@@ -9,7 +9,7 @@ function __fish_apt_no_subcommand -d (N_ 'Test if apt has yet to be given the su
return 0
end
-function __fish_apt_use_package -d (N_ 'Test if apt command should have packages as potential completion')
+function __fish_apt_use_package --description 'Test if apt command should have packages as potential completion'
for i in (commandline -opc)
if contains -- $i contains install remove build-dep
return 0
@@ -18,47 +18,47 @@ function __fish_apt_use_package -d (N_ 'Test if apt command should have packages
return 1
end
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (N_ 'Package')
+complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' --description 'Package'
-complete -c apt-get -s h -l help -d (N_ 'Display help and exit')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d (N_ 'Update sources')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d (N_ 'Upgrade or install newest packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d (N_ 'Use with dselect front-end')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d (N_ 'Distro upgrade')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (N_ 'Install one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d (N_ 'Remove one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d (N_ 'Fetch source packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d (N_ 'Install/remove packages for dependencies')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d (N_ 'Update cache and check dependencies')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d (N_ 'Clean local caches and packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d (N_ 'Clean packages no longer be downloaded')
-complete -c apt-get -s d -l download-only -d (N_ 'Download Only')
-complete -c apt-get -s f -l fix-broken -d (N_ 'Correct broken dependencies')
-complete -c apt-get -s m -l fix-missing -d (N_ 'Ignore missing packages')
-complete -c apt-get -l no-download -d (N_ 'Disable downloading packages')
-complete -c apt-get -s q -l quiet -d (N_ 'Quiet mode')
-complete -c apt-get -s s -l simulate -d (N_ 'Perform a simulation')
-complete -c apt-get -s y -l assume-yes -d (N_ 'Automatic yes to prompts')
-complete -c apt-get -s u -l show-upgraded -d (N_ 'Show upgraded packages')
-complete -c apt-get -s V -l verbose-versions -d (N_ 'Show full versions for packages')
-complete -c apt-get -s b -l compile -d (N_ 'Compile source packages')
-complete -c apt-get -s b -l build -d (N_ 'Compile source packages')
-complete -c apt-get -l ignore-hold -d (N_ 'Ignore package Holds')
-complete -c apt-get -l no-upgrade -d (N_ "Do not upgrade packages")
-complete -c apt-get -l force-yes -d (N_ 'Force yes')
-complete -c apt-get -l print-uris -d (N_ 'Print the URIs')
-complete -c apt-get -l purge -d (N_ 'Use purge instead of remove')
-complete -c apt-get -l reinstall -d (N_ 'Reinstall packages')
-complete -c apt-get -l list-cleanup -d (N_ 'Erase obsolete files')
-complete -c apt-get -s t -l target-release -d (N_ 'Control default input to the policy engine')
-complete -c apt-get -l trivial-only -d (N_ 'Only perform operations that are trivial')
-complete -c apt-get -l no-remove -d (N_ 'Abort if any packages are to be removed')
-complete -c apt-get -l only-source -d (N_ 'Only accept source packages')
-complete -c apt-get -l diff-only -d (N_ 'Download only diff file')
-complete -c apt-get -l tar-only -d (N_ 'Download only tar file')
-complete -c apt-get -l arch-only -d (N_ 'Only process arch-dependant build-dependencies')
-complete -c apt-get -l allow-unauthenticated -d (N_ 'Ignore non-authenticated packages')
-complete -c apt-get -s v -l version -d (N_ 'Display version and exit')
-complete -r -c apt-get -s c -l config-file -d (N_ 'Specify a config file')
-complete -r -c apt-get -s o -l option -d (N_ 'Set a config option')
+complete -c apt-get -s h -l help --description 'Display help and exit'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' --description 'Update sources'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' --description 'Upgrade or install newest packages'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' --description 'Use with dselect front-end'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' --description 'Distro upgrade'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' --description 'Install one or more packages'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' --description 'Remove one or more packages'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' --description 'Fetch source packages'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' --description 'Install/remove packages for dependencies'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' --description 'Update cache and check dependencies'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' --description 'Clean local caches and packages'
+complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' --description 'Clean packages no longer be downloaded'
+complete -c apt-get -s d -l download-only --description 'Download Only'
+complete -c apt-get -s f -l fix-broken --description 'Correct broken dependencies'
+complete -c apt-get -s m -l fix-missing --description 'Ignore missing packages'
+complete -c apt-get -l no-download --description 'Disable downloading packages'
+complete -c apt-get -s q -l quiet --description 'Quiet mode'
+complete -c apt-get -s s -l simulate --description 'Perform a simulation'
+complete -c apt-get -s y -l assume-yes --description 'Automatic yes to prompts'
+complete -c apt-get -s u -l show-upgraded --description 'Show upgraded packages'
+complete -c apt-get -s V -l verbose-versions --description 'Show full versions for packages'
+complete -c apt-get -s b -l compile --description 'Compile source packages'
+complete -c apt-get -s b -l build --description 'Compile source packages'
+complete -c apt-get -l ignore-hold --description 'Ignore package Holds'
+complete -c apt-get -l no-upgrade --description "Do not upgrade packages"
+complete -c apt-get -l force-yes --description 'Force yes'
+complete -c apt-get -l print-uris --description 'Print the URIs'
+complete -c apt-get -l purge --description 'Use purge instead of remove'
+complete -c apt-get -l reinstall --description 'Reinstall packages'
+complete -c apt-get -l list-cleanup --description 'Erase obsolete files'
+complete -c apt-get -s t -l target-release --description 'Control default input to the policy engine'
+complete -c apt-get -l trivial-only --description 'Only perform operations that are trivial'
+complete -c apt-get -l no-remove --description 'Abort if any packages are to be removed'
+complete -c apt-get -l only-source --description 'Only accept source packages'
+complete -c apt-get -l diff-only --description 'Download only diff file'
+complete -c apt-get -l tar-only --description 'Download only tar file'
+complete -c apt-get -l arch-only --description 'Only process arch-dependant build-dependencies'
+complete -c apt-get -l allow-unauthenticated --description 'Ignore non-authenticated packages'
+complete -c apt-get -s v -l version --description 'Display version and exit'
+complete -r -c apt-get -s c -l config-file --description 'Specify a config file'
+complete -r -c apt-get -s o -l option --description 'Set a config option'
diff --git a/share/completions/apt-key.fish b/share/completions/apt-key.fish
index 5939a382..ab66bc2d 100644
--- a/share/completions/apt-key.fish
+++ b/share/completions/apt-key.fish
@@ -1,5 +1,5 @@
#apt-key
-complete -r -c apt-key -a add -d (N_ "Add a new key")
-complete -f -c apt-key -a del -d (N_ "Remove a key")
-complete -f -c apt-key -a list -d (N_ "List trusted keys")
+complete -r -c apt-key -a add --description "Add a new key"
+complete -f -c apt-key -a del --description "Remove a key"
+complete -f -c apt-key -a list --description "List trusted keys"
diff --git a/share/completions/apt-listbugs.fish b/share/completions/apt-listbugs.fish
index b0d45aba..c6f9a231 100644
--- a/share/completions/apt-listbugs.fish
+++ b/share/completions/apt-listbugs.fish
@@ -1,25 +1,25 @@
#apt-listbugs
-complete -c apt-listbugs -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-listbugs -s s -l severity -a "critical grave" -d (N_ "Set severity")
-complete -f -c apt-listbugs -s T -l tag -d (N_ "Tags you want to see")
-complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" -d (N_ "Bug-status you want to see")
-complete -f -c apt-listbugs -s l -l showless -d (N_ "Ignore bugs in your system")
-complete -f -c apt-listbugs -s g -l showgreater -d (N_ "Ignore newer bugs than upgrade packages")
-complete -f -c apt-listbugs -s D -l show-downgrade -d (N_ "Bugs for downgrade packages")
-complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d (N_ "Bug Tracking system")
-complete -f -c apt-listbugs -s p -l port -d (N_ "Specify port for web interface")
-complete -f -c apt-listbugs -s R -l release-critical -d (N_ "Use daily bug report")
-complete -f -c apt-listbugs -s I -l index -d (N_ "Use the raw index.db")
-complete -f -c apt-listbugs -s X -l indexdir -d (N_ "Specify index dir")
-complete -f -c apt-listbugs -s P -l pin-priority -d (N_ "Specify Pin-Priority value")
-complete -f -c apt-listbugs -l title -d (N_ "Specify the title of rss")
-complete -f -c apt-listbugs -s f -l force-download -d (N_ "Retrieve fresh bugs")
-complete -f -c apt-listbugs -s q -l quiet -d (N_ "Do not display progress bar")
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d (N_ "Specify local cache dir")
-complete -f -c apt-listbugs -s t -l timer -d (N_ "Specify the expire cache timer")
-complete -c apt-listbugs -s C -l aptconf -d (N_ "Specify apt config file")
-complete -f -c apt-listbugs -s y -l force-yes -d (N_ "Assume yes to all questions")
-complete -f -c apt-listbugs -s n -l force-no -d (N_ "Assume no to all questions")
-complete -c apt-listbugs -a list -d (N_ "List bugs from packages")
-complete -c apt-listbugs -a rss -d (N_ "List bugs in rss format")
+complete -c apt-listbugs -s h -l help --description "Display help and exit"
+complete -f -c apt-listbugs -s s -l severity -a "critical grave" --description "Set severity"
+complete -f -c apt-listbugs -s T -l tag --description "Tags you want to see"
+complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" --description "Bug-status you want to see"
+complete -f -c apt-listbugs -s l -l showless --description "Ignore bugs in your system"
+complete -f -c apt-listbugs -s g -l showgreater --description "Ignore newer bugs than upgrade packages"
+complete -f -c apt-listbugs -s D -l show-downgrade --description "Bugs for downgrade packages"
+complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" --description "Bug Tracking system"
+complete -f -c apt-listbugs -s p -l port --description "Specify port for web interface"
+complete -f -c apt-listbugs -s R -l release-critical --description "Use daily bug report"
+complete -f -c apt-listbugs -s I -l index --description "Use the raw index.db"
+complete -f -c apt-listbugs -s X -l indexdir --description "Specify index dir"
+complete -f -c apt-listbugs -s P -l pin-priority --description "Specify Pin-Priority value"
+complete -f -c apt-listbugs -l title --description "Specify the title of rss"
+complete -f -c apt-listbugs -s f -l force-download --description "Retrieve fresh bugs"
+complete -f -c apt-listbugs -s q -l quiet --description "Do not display progress bar"
+complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" --description "Specify local cache dir"
+complete -f -c apt-listbugs -s t -l timer --description "Specify the expire cache timer"
+complete -c apt-listbugs -s C -l aptconf --description "Specify apt config file"
+complete -f -c apt-listbugs -s y -l force-yes --description "Assume yes to all questions"
+complete -f -c apt-listbugs -s n -l force-no --description "Assume no to all questions"
+complete -c apt-listbugs -a list --description "List bugs from packages"
+complete -c apt-listbugs -a rss --description "List bugs in rss format"
diff --git a/share/completions/apt-listchanges.fish b/share/completions/apt-listchanges.fish
index c02c9585..770cbf06 100644
--- a/share/completions/apt-listchanges.fish
+++ b/share/completions/apt-listchanges.fish
@@ -1,13 +1,13 @@
#apt-listchanges
-complete -c apt-listchanges -l help -d (N_ "Display help and exit")
-complete -c apt-listchanges -l apt -d (N_ "Read filenames from pipe")
-complete -f -c apt-listchanges -s v -l verbose -d (N_ "Verbose mode")
-complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d (N_ "Select frontend interface")
-complete -r -f -c apt-listchanges -l email-address -d (N_ "Specify email address")
-complete -f -c apt-listchanges -s c -l confirm -d (N_ "Ask confirmation")
-complete -f -c apt-listchanges -s a -l all -d (N_ "Display all changelogs")
-complete -r -c apt-listchanges -l save_seen -d (N_ "Avoid changelogs from db in named file")
-complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d (N_ "Select display")
-complete -f -c apt-listchanges -s h -l headers -d (N_ "Insert header")
-complete -f -c apt-listchanges -l debug -d (N_ "Display debug info")
-complete -r -c apt-listchanges -l profile -d (N_ "Select an option profile")
+complete -c apt-listchanges -l help --description "Display help and exit"
+complete -c apt-listchanges -l apt --description "Read filenames from pipe"
+complete -f -c apt-listchanges -s v -l verbose --description "Verbose mode"
+complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" --description "Select frontend interface"
+complete -r -f -c apt-listchanges -l email-address --description "Specify email address"
+complete -f -c apt-listchanges -s c -l confirm --description "Ask confirmation"
+complete -f -c apt-listchanges -s a -l all --description "Display all changelogs"
+complete -r -c apt-listchanges -l save_seen --description "Avoid changelogs from db in named file"
+complete -r -f -c apt-listchanges -l which -a "news changelogs both" --description "Select display"
+complete -f -c apt-listchanges -s h -l headers --description "Insert header"
+complete -f -c apt-listchanges -l debug --description "Display debug info"
+complete -r -c apt-listchanges -l profile --description "Select an option profile"
diff --git a/share/completions/apt-move.fish b/share/completions/apt-move.fish
index f7e555df..1870bd3e 100644
--- a/share/completions/apt-move.fish
+++ b/share/completions/apt-move.fish
@@ -1,22 +1,22 @@
#apt-move
-complete -c apt-move -a get -d (N_ "Generate master file")
-complete -c apt-move -a getlocal -d (N_ "Alias for 'get'")
-complete -f -c apt-move -a move -d (N_ "Move packages to local tree")
-complete -f -c apt-move -a delete -d (N_ "Delete obsolete package files")
-complete -f -c apt-move -a packages -d (N_ "Build new local files")
-complete -f -c apt-move -a fsck -d (N_ "Rebuild index files")
-complete -f -c apt-move -a update -d (N_ "Move packages from cache to local mirror")
-complete -f -c apt-move -a local -d (N_ "Alias for 'move delete packages'")
-complete -f -c apt-move -a localupdate -d (N_ "Alias for 'update'")
-complete -f -c apt-move -a mirror -d (N_ "Download package missing from mirror")
-complete -f -c apt-move -a sync -d (N_ "Sync packages installed")
+complete -c apt-move -a get --description "Generate master file"
+complete -c apt-move -a getlocal --description "Alias for 'get'"
+complete -f -c apt-move -a move --description "Move packages to local tree"
+complete -f -c apt-move -a delete --description "Delete obsolete package files"
+complete -f -c apt-move -a packages --description "Build new local files"
+complete -f -c apt-move -a fsck --description "Rebuild index files"
+complete -f -c apt-move -a update --description "Move packages from cache to local mirror"
+complete -f -c apt-move -a local --description "Alias for 'move delete packages'"
+complete -f -c apt-move -a localupdate --description "Alias for 'update'"
+complete -f -c apt-move -a mirror --description "Download package missing from mirror"
+complete -f -c apt-move -a sync --description "Sync packages installed"
complete -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
-complete -c apt-move -a movefile -d (N_ "Move file specified on commandline")
+complete -c apt-move -a movefile --description "Move file specified on commandline"
complete -f -c apt-move -a listbin -d (N_ "List packages that may serve as input to mirrorbin or mirrorsource" )
-complete -f -c apt-move -a mirrorbin -d (N_ "Fetch package from STDIN")
-complete -f -c apt-move -a mirrorsrc -d (N_ "Fetch source package from STDIN")
-complete -f -c apt-move -s a -d (N_ "Process all packages")
-complete -c apt-move -s c -d (N_ "Use specific conffile")
-complete -f -c apt-move -s f -d (N_ "Force deletion")
-complete -f -c apt-move -s q -d (N_ "Suppresses normal output")
-complete -f -c apt-move -s t -d (N_ "Test run")
+complete -f -c apt-move -a mirrorbin --description "Fetch package from STDIN"
+complete -f -c apt-move -a mirrorsrc --description "Fetch source package from STDIN"
+complete -f -c apt-move -s a --description "Process all packages"
+complete -c apt-move -s c --description "Use specific conffile"
+complete -f -c apt-move -s f --description "Force deletion"
+complete -f -c apt-move -s q --description "Suppresses normal output"
+complete -f -c apt-move -s t --description "Test run"
diff --git a/share/completions/apt-proxy-import.fish b/share/completions/apt-proxy-import.fish
index 8e094578..2925e8d1 100644
--- a/share/completions/apt-proxy-import.fish
+++ b/share/completions/apt-proxy-import.fish
@@ -1,10 +1,10 @@
#apt-proxy-import
-complete -c apt-proxy-import -s h -l help -d (N_ 'Display help and exit')
-complete -f -c apt-proxy-import -s V -l version -d (N_ 'Display version and exit')
-complete -f -c apt-proxy-import -s v -l verbose -d (N_ 'Verbose mode')
-complete -f -c apt-proxy-import -s q -l quiet -d (N_ 'No message to STDOUT')
-complete -f -c apt-proxy-import -s r -l recursive -d (N_ 'Recurse into subdir')
-complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|sgrep /\$)' -d (N_ 'Dir to import')
-complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d (N_ 'Change to user')
-complete -r -c apt-proxy-import -s d -l debug -d (N_ 'Debug level[default 0]')
+complete -c apt-proxy-import -s h -l help --description 'Display help and exit'
+complete -f -c apt-proxy-import -s V -l version --description 'Display version and exit'
+complete -f -c apt-proxy-import -s v -l verbose --description 'Verbose mode'
+complete -f -c apt-proxy-import -s q -l quiet --description 'No message to STDOUT'
+complete -f -c apt-proxy-import -s r -l recursive --description 'Recurse into subdir'
+complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|sgrep /\$)' --description 'Dir to import'
+complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' --description 'Change to user'
+complete -r -c apt-proxy-import -s d -l debug --description 'Debug level[default 0]'
diff --git a/share/completions/apt-rdepends.fish b/share/completions/apt-rdepends.fish
index 932837e4..4dfb72d0 100644
--- a/share/completions/apt-rdepends.fish
+++ b/share/completions/apt-rdepends.fish
@@ -1,13 +1,13 @@
#apt-rdepends
-complete -c apt-rdepends -l help -d (N_ "Display help and exit")
-complete -f -c apt-rdepends -s b -l build-depends -d (N_ "Show build dependencies")
-complete -f -c apt-rdepends -s d -l dotty -d (N_ "Generate a dotty graph")
-complete -f -c apt-rdepends -s p -l print-state -d (N_ "Show state of dependencies")
-complete -f -c apt-rdepends -s r -l reverse -d (N_ "List packages depending on")
-complete -r -f -c apt-rdepends -s f -l follow -d (N_ "Comma-separated list of dependancy types to follow recursively")
-complete -r -f -c apt-rdepends -s s -l show -d (N_ "Comma-separated list of dependancy types to show")
-complete -r -f -c apt-rdepends -l state-follow -d (N_ "Comma-separated list of package installation states to follow recursively")
-complete -r -f -c apt-rdepends -l state-show -d (N_ "Comma-separated list of package installation states to show")
-complete -f -c apt-rdepends -l man -d (N_ "Display man page")
-complete -f -c apt-rdepends -l version -d (N_ "Display version and exit")
+complete -c apt-rdepends -l help --description "Display help and exit"
+complete -f -c apt-rdepends -s b -l build-depends --description "Show build dependencies"
+complete -f -c apt-rdepends -s d -l dotty --description "Generate a dotty graph"
+complete -f -c apt-rdepends -s p -l print-state --description "Show state of dependencies"
+complete -f -c apt-rdepends -s r -l reverse --description "List packages depending on"
+complete -r -f -c apt-rdepends -s f -l follow --description "Comma-separated list of dependancy types to follow recursively"
+complete -r -f -c apt-rdepends -s s -l show --description "Comma-separated list of dependancy types to show"
+complete -r -f -c apt-rdepends -l state-follow --description "Comma-separated list of package installation states to follow recursively"
+complete -r -f -c apt-rdepends -l state-show --description "Comma-separated list of package installation states to show"
+complete -f -c apt-rdepends -l man --description "Display man page"
+complete -f -c apt-rdepends -l version --description "Display version and exit"
diff --git a/share/completions/apt-setup.fish b/share/completions/apt-setup.fish
index dee1f006..6b04a03a 100644
--- a/share/completions/apt-setup.fish
+++ b/share/completions/apt-setup.fish
@@ -1,4 +1,4 @@
#apt-setup
-complete -c apt-setup -a probe -d (N_ "Probe a CD")
-complete -c apt-setup -s N -d (N_ "Run in noninteractive mode")
+complete -c apt-setup -a probe --description "Probe a CD"
+complete -c apt-setup -s N --description "Run in noninteractive mode"
diff --git a/share/completions/apt-show-source.fish b/share/completions/apt-show-source.fish
index 0ab5c32f..fe130828 100644
--- a/share/completions/apt-show-source.fish
+++ b/share/completions/apt-show-source.fish
@@ -1,10 +1,10 @@
#apt-show-source
-complete -c apt-show-source -s h -l help -d (N_ 'Display help and exit')
-complete -r -c apt-show-source -l status-file -d (N_ 'Read package from file') -f
-complete -r -c apt-show-source -o stf -d (N_ 'Read package from file') -f
-complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists' -d (N_ 'Specify APT list dir')
-complete -r -c apt-show-source -o ld -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists' -d (N_ 'Specify APT list dir')
-complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d (N_ 'List PKG info')
-complete -f -c apt-show-source -l version-only -d (N_ 'Display version and exit')
-complete -f -c apt-show-source -s a -l all -d (N_ 'Print all source packages with version')
-complete -f -c apt-show-source -s v -l verbose -d (N_ 'Verbose mode')
+complete -c apt-show-source -s h -l help --description 'Display help and exit'
+complete -r -c apt-show-source -l status-file --description 'Read package from file' -f
+complete -r -c apt-show-source -o stf --description 'Read package from file' -f
+complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists' --description 'Specify APT list dir'
+complete -r -c apt-show-source -o ld -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists' --description 'Specify APT list dir'
+complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' --description 'List PKG info'
+complete -f -c apt-show-source -l version-only --description 'Display version and exit'
+complete -f -c apt-show-source -s a -l all --description 'Print all source packages with version'
+complete -f -c apt-show-source -s v -l verbose --description 'Verbose mode'
diff --git a/share/completions/apt-show-versions.fish b/share/completions/apt-show-versions.fish
index 4c687280..d403ea55 100644
--- a/share/completions/apt-show-versions.fish
+++ b/share/completions/apt-show-versions.fish
@@ -1,14 +1,14 @@
#apt-show-versions
-complete -c apt-show-source -s h -l help -d (N_ 'Display help and exit')
-complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d (N_ 'Print PKG versions')
-complete -f -c apt-show-versions -s r -l regex -d (N_ 'Using regex')
-complete -f -c apt-show-versions -s u -l upgradeable -d (N_ 'Print only upgradeable packages')
-complete -f -c apt-show-versions -s a -l allversions -d (N_ 'Print all versions')
-complete -f -c apt-show-versions -s b -l brief -d (N_ 'Print package name/distro')
-complete -f -c apt-show-versions -s v -l verbose -d (N_ 'Print verbose info')
-complete -f -c apt-show-versions -s i -l initialize -d (N_ 'Init or update cache only')
-complete -r -c apt-show-versions -l status-file -d (N_ 'Read package from file')
-complete -r -c apt-show-versions -o stf -d (N_ 'Read package from file')
-complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists /var/state/apt/lists' -d (N_ 'Specify APT list dir')
-complete -r -c apt-show-versions -o ld -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists /var/state/apt/lists' -d (N_ 'Specify APT list dir')
+complete -c apt-show-source -s h -l help --description 'Display help and exit'
+complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' --description 'Print PKG versions'
+complete -f -c apt-show-versions -s r -l regex --description 'Using regex'
+complete -f -c apt-show-versions -s u -l upgradeable --description 'Print only upgradeable packages'
+complete -f -c apt-show-versions -s a -l allversions --description 'Print all versions'
+complete -f -c apt-show-versions -s b -l brief --description 'Print package name/distro'
+complete -f -c apt-show-versions -s v -l verbose --description 'Print verbose info'
+complete -f -c apt-show-versions -s i -l initialize --description 'Init or update cache only'
+complete -r -c apt-show-versions -l status-file --description 'Read package from file'
+complete -r -c apt-show-versions -o stf --description 'Read package from file'
+complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists /var/state/apt/lists' --description 'Specify APT list dir'
+complete -r -c apt-show-versions -o ld -a '(ls -Fp .|sgrep /\$) /var/lib/apt/lists /var/state/apt/lists' --description 'Specify APT list dir'
diff --git a/share/completions/apt-sortpkgs.fish b/share/completions/apt-sortpkgs.fish
index 7e38c666..d1f8c066 100644
--- a/share/completions/apt-sortpkgs.fish
+++ b/share/completions/apt-sortpkgs.fish
@@ -1,7 +1,7 @@
#apt-sortpkgs
-complete -c apt-sortpkgs -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-sortpkgs -s s -l source -d (N_ "Use source index field")
-complete -f -c apt-sortpkgs -s v -l version -d (N_ "Display version and exit")
-complete -r -c apt-sortpkgs -s c -l conf-file -d (N_ "Specify conffile")
-complete -r -f -c apt-sortpkgs -s o -l option -d (N_ "Set config options")
+complete -c apt-sortpkgs -s h -l help --description "Display help and exit"
+complete -f -c apt-sortpkgs -s s -l source --description "Use source index field"
+complete -f -c apt-sortpkgs -s v -l version --description "Display version and exit"
+complete -r -c apt-sortpkgs -s c -l conf-file --description "Specify conffile"
+complete -r -f -c apt-sortpkgs -s o -l option --description "Set config options"
diff --git a/share/completions/apt-spy.fish b/share/completions/apt-spy.fish
index a89e9330..0dd2bce1 100644
--- a/share/completions/apt-spy.fish
+++ b/share/completions/apt-spy.fish
@@ -1,20 +1,20 @@
#apt-spy
-complete -c apt-spy -s h -d (N_ "Display help and exit")
-complete -f -c apt-spy -s d -a "stable testing unstable" -d (N_ "Debian distribution")
-complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (N_ "Servers in the areas")
-complete -c apt-spy -s c -d (N_ "Conf file")
-complete -f -c apt-spy -s e -d (N_ "Finish after number of servers")
-complete -c apt-spy -s f -d (N_ "File to grab servers")
-complete -c apt-spy -s i -d (N_ "File as input")
-complete -c apt-spy -s m -d (N_ "Mirror-list file")
-complete -c apt-spy -s o -d (N_ "Output sources.list file")
-complete -f -c apt-spy -s p -d (N_ "Use proxy server")
-complete -f -c apt-spy -s s -d (N_ "Comma separated country list")
-complete -f -c apt-spy -s t -d (N_ "How long in sec to download")
-complete -f -c apt-spy -s u -d (N_ "Custom URL to get mirror list")
-complete -c apt-spy -s w -d (N_ "Write top servers to file")
-complete -f -c apt-spy -s n -d (N_ "Number of top servers")
-complete -f -c apt-spy -a "update" -d (N_ "Update mirror list")
-complete -f -c apt-spy -s v -d (N_ "Version number")
+complete -c apt-spy -s h --description "Display help and exit"
+complete -f -c apt-spy -s d -a "stable testing unstable" --description "Debian distribution"
+complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" --description "Servers in the areas"
+complete -c apt-spy -s c --description "Conf file"
+complete -f -c apt-spy -s e --description "Finish after number of servers"
+complete -c apt-spy -s f --description "File to grab servers"
+complete -c apt-spy -s i --description "File as input"
+complete -c apt-spy -s m --description "Mirror-list file"
+complete -c apt-spy -s o --description "Output sources.list file"
+complete -f -c apt-spy -s p --description "Use proxy server"
+complete -f -c apt-spy -s s --description "Comma separated country list"
+complete -f -c apt-spy -s t --description "How long in sec to download"
+complete -f -c apt-spy -s u --description "Custom URL to get mirror list"
+complete -c apt-spy -s w --description "Write top servers to file"
+complete -f -c apt-spy -s n --description "Number of top servers"
+complete -f -c apt-spy -a "update" --description "Update mirror list"
+complete -f -c apt-spy -s v --description "Version number"
diff --git a/share/completions/apt-src.fish b/share/completions/apt-src.fish
index aa3e414d..b795658d 100644
--- a/share/completions/apt-src.fish
+++ b/share/completions/apt-src.fish
@@ -1,24 +1,24 @@
#apt-src
-complete -c apt-src -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-src -a "update" -d (N_ "Update list of source packages")
-complete -f -c apt-src -a "install" -d (N_ "Install source packages")
-complete -f -c apt-src -a "upgrade" -d (N_ "Upgrade source packages")
-complete -f -c apt-src -a "remove" -d (N_ "Remove source packages")
-complete -f -c apt-src -a "build" -d (N_ "Build source packages")
-complete -f -c apt-src -a "clean" -d (N_ "Clean source packages")
-complete -f -c apt-src -a "import" -d (N_ "Detect known source tree")
-complete -f -c apt-src -a "list" -d (N_ "List installed source package\(s\)")
-complete -f -c apt-src -a "location" -d (N_ "Root source tree")
-complete -f -c apt-src -a "version" -d (N_ "Version of source package")
-complete -f -c apt-src -a "name" -d (N_ "Name of the source package")
-complete -f -c apt-src -s b -l build -d (N_ "Build source packages")
-complete -f -c apt-src -s i -l installdebs -d (N_ "Install after build")
-complete -f -c apt-src -s p -l patch -d (N_ "Patch local changes")
-complete -r -c apt-src -s l -l location -d (N_ "Specify a dir")
-complete -c apt-src -s c -l here -d (N_ "Run on current dir")
-complete -f -c apt-src -l upstream-version -d (N_ "Omit debian version")
-complete -f -c apt-src -s k -l keep-built -d (N_ "Do not del built files")
-complete -f -c apt-src -s n -l no-delete-source -d (N_ "Do not del source files")
-complete -f -c apt-src -l version -d (N_ "Source tree version")
-complete -f -c apt-src -s q -l quiet -d (N_ "Output to /dev/null")
-complete -f -c apt-src -s t -l trace -d (N_ "Output trace")
+complete -c apt-src -s h -l help --description "Display help and exit"
+complete -f -c apt-src -a "update" --description "Update list of source packages"
+complete -f -c apt-src -a "install" --description "Install source packages"
+complete -f -c apt-src -a "upgrade" --description "Upgrade source packages"
+complete -f -c apt-src -a "remove" --description "Remove source packages"
+complete -f -c apt-src -a "build" --description "Build source packages"
+complete -f -c apt-src -a "clean" --description "Clean source packages"
+complete -f -c apt-src -a "import" --description "Detect known source tree"
+complete -f -c apt-src -a "list" --description "List installed source package\(s\)"
+complete -f -c apt-src -a "location" --description "Root source tree"
+complete -f -c apt-src -a "version" --description "Version of source package"
+complete -f -c apt-src -a "name" --description "Name of the source package"
+complete -f -c apt-src -s b -l build --description "Build source packages"
+complete -f -c apt-src -s i -l installdebs --description "Install after build"
+complete -f -c apt-src -s p -l patch --description "Patch local changes"
+complete -r -c apt-src -s l -l location --description "Specify a dir"
+complete -c apt-src -s c -l here --description "Run on current dir"
+complete -f -c apt-src -l upstream-version --description "Omit debian version"
+complete -f -c apt-src -s k -l keep-built --description "Do not del built files"
+complete -f -c apt-src -s n -l no-delete-source --description "Do not del source files"
+complete -f -c apt-src -l version --description "Source tree version"
+complete -f -c apt-src -s q -l quiet --description "Output to /dev/null"
+complete -f -c apt-src -s t -l trace --description "Output trace"
diff --git a/share/completions/apt-zip-inst.fish b/share/completions/apt-zip-inst.fish
index d19ab31f..d3726c27 100644
--- a/share/completions/apt-zip-inst.fish
+++ b/share/completions/apt-zip-inst.fish
@@ -1,10 +1,10 @@
#apt-zip-inst
-complete -c apt-zip-inst -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-zip-inst -s V -l version -d (N_ "Display version and exit")
-complete -c apt-zip-inst -s m -l medium -d (N_ "Removable medium")
-complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (N_ "Select an action")
-complete -c apt-zip-inst -s p -l packages -d (N_ "List of packages to install")
-complete -f -c apt-zip-inst -s f -l fix-broken -d (N_ "Fix broken option")
-complete -c apt-zip-inst -l skip-mount -d (N_ "Specify a non-mountpoint dir")
+complete -c apt-zip-inst -s h -l help --description "Display help and exit"
+complete -f -c apt-zip-inst -s V -l version --description "Display version and exit"
+complete -c apt-zip-inst -s m -l medium --description "Removable medium"
+complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" --description "Select an action"
+complete -c apt-zip-inst -s p -l packages --description "List of packages to install"
+complete -f -c apt-zip-inst -s f -l fix-broken --description "Fix broken option"
+complete -c apt-zip-inst -l skip-mount --description "Specify a non-mountpoint dir"
diff --git a/share/completions/apt-zip-list.fish b/share/completions/apt-zip-list.fish
index 8f10b800..21df98e1 100644
--- a/share/completions/apt-zip-list.fish
+++ b/share/completions/apt-zip-list.fish
@@ -1,13 +1,13 @@
#apt-zip-list
-complete -c apt-zip-list -s h -l help -d (N_ "Display help and exit")
-complete -f -c apt-zip-list -s V -l version -d (N_ "Display version and exit")
-complete -c apt-zip-list -s m -l medium -d (N_ "Removable medium")
-complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (N_ "Select an action")
-complete -c apt-zip-list -s p -l packages -d (N_ "List of packages to install")
-complete -f -c apt-zip-list -s f -l fix-broken -d (N_ "Fix broken option")
-complete -c apt-zip-list -l skip-mount -d (N_ "Specify a non-mountpoint dir")
-complete -c apt-zip-list -s M -l method -d (N_ "Select a method")
-complete -c apt-zip-list -s o -l options -a "tar restart" -d (N_ "Specify options")
-complete -c apt-zip-list -s A -l accept -a "http ftp" -d (N_ "Accept protocols")
-complete -c apt-zip-list -s R -l reject -a "http ftp" -d (N_ "Reject protocols")
+complete -c apt-zip-list -s h -l help --description "Display help and exit"
+complete -f -c apt-zip-list -s V -l version --description "Display version and exit"
+complete -c apt-zip-list -s m -l medium --description "Removable medium"
+complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" --description "Select an action"
+complete -c apt-zip-list -s p -l packages --description "List of packages to install"
+complete -f -c apt-zip-list -s f -l fix-broken --description "Fix broken option"
+complete -c apt-zip-list -l skip-mount --description "Specify a non-mountpoint dir"
+complete -c apt-zip-list -s M -l method --description "Select a method"
+complete -c apt-zip-list -s o -l options -a "tar restart" --description "Specify options"
+complete -c apt-zip-list -s A -l accept -a "http ftp" --description "Accept protocols"
+complete -c apt-zip-list -s R -l reject -a "http ftp" --description "Reject protocols"
diff --git a/share/completions/arp.fish b/share/completions/arp.fish
index 60ec8df0..564d7a21 100644
--- a/share/completions/arp.fish
+++ b/share/completions/arp.fish
@@ -1,11 +1,11 @@
#completion for arp
-complete -c arp -s v -l verbose -d (N_ "Verbose mode")
-complete -c arp -s n -l numeric -d (N_ "Numerical address")
-complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d (N_ "Class of hw type")
-complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d (N_ "Show arp entries")
-complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d (N_ "Remove an entry for hostname")
-complete -c arp -s D -l use-device -d (N_ "Use hardware address")
-complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d (N_ "Select interface")
-complete -x -c arp -s s -l set -d (N_ "Manually create ARP address") -a "(__fish_print_hostnames)"
-complete -f -c arp -s f -l file -d (N_ "Take addr from filename, default /etc/ethers")
+complete -c arp -s v -l verbose --description "Verbose mode"
+complete -c arp -s n -l numeric --description "Numerical address"
+complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" --description "Class of hw type"
+complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" --description "Show arp entries"
+complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" --description "Remove an entry for hostname"
+complete -c arp -s D -l use-device --description "Use hardware address"
+complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" --description "Select interface"
+complete -x -c arp -s s -l set --description "Manually create ARP address" -a "(__fish_print_hostnames)"
+complete -f -c arp -s f -l file --description "Take addr from filename, default /etc/ethers"
diff --git a/share/completions/at.fish b/share/completions/at.fish
index a469113a..59a35e05 100644
--- a/share/completions/at.fish
+++ b/share/completions/at.fish
@@ -1,10 +1,10 @@
#at
-complete -f -c at -s V -d (N_ "Display version and exit")
-complete -f -c at -s q -d (N_ "Use specified queue")
-complete -f -c at -s m -d (N_ "Send mail to user")
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d (N_ "Read job from file")
-complete -f -c at -s l -d (N_ "Alias for atq")
-complete -f -c at -s d -d (N_ "Alias for atrm")
-complete -f -c at -s v -d (N_ "Show the time")
-complete -f -c at -s c -d (N_ "Print the jobs listed")
+complete -f -c at -s V --description "Display version and exit"
+complete -f -c at -s q --description "Use specified queue"
+complete -f -c at -s m --description "Send mail to user"
+complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" --description "Read job from file"
+complete -f -c at -s l --description "Alias for atq"
+complete -f -c at -s d --description "Alias for atrm"
+complete -f -c at -s v --description "Show the time"
+complete -f -c at -s c --description "Print the jobs listed"
diff --git a/share/completions/atd.fish b/share/completions/atd.fish
index dfae3022..cf980c3f 100644
--- a/share/completions/atd.fish
+++ b/share/completions/atd.fish
@@ -1,6 +1,6 @@
#atd
-complete -f -c atd -s l -d (N_ "Limiting load factor")
-complete -f -c atd -s b -d (N_ "Minimum interval in seconds")
-complete -f -c atd -s d -d (N_ "Debug mode")
-complete -f -c atd -s s -d (N_ "Process at queue only once")
+complete -f -c atd -s l --description "Limiting load factor"
+complete -f -c atd -s b --description "Minimum interval in seconds"
+complete -f -c atd -s d --description "Debug mode"
+complete -f -c atd -s s --description "Process at queue only once"
diff --git a/share/completions/atq.fish b/share/completions/atq.fish
index b4ac009c..33ee2c63 100644
--- a/share/completions/atq.fish
+++ b/share/completions/atq.fish
@@ -1,4 +1,4 @@
#atq
-complete -f -c atq -s V -d (N_ "Display version and exit")
-complete -f -c atq -s q -d (N_ "Use specified queue")
+complete -f -c atq -s V --description "Display version and exit"
+complete -f -c atq -s q --description "Use specified queue"
diff --git a/share/completions/atrm.fish b/share/completions/atrm.fish
index 09923ddb..2606dfad 100644
--- a/share/completions/atrm.fish
+++ b/share/completions/atrm.fish
@@ -1,2 +1,2 @@
#atrm
-complete -f -c atrm -s V -d (N_ "Display version and exit")
+complete -f -c atrm -s V --description "Display version and exit"
diff --git a/share/completions/bc.fish b/share/completions/bc.fish
index 73957c42..d7e9d38f 100644
--- a/share/completions/bc.fish
+++ b/share/completions/bc.fish
@@ -1,9 +1,9 @@
# Completions for the binary calculator
-complete -c bc -s i -l interactive -d (N_ "Force interactive mode")
-complete -c bc -s l -l math-lib -d (N_ "Define math library")
-complete -c bc -s w -l warn -d (N_ "Give warnings for extensions to POSIX bc")
-complete -c bc -s s -l standard -d (N_ "Process exactly POSIX bc")
-complete -c bc -s q -l quiet -d (N_ "Do not print the GNU welcome")
-complete -c bc -s v -l version -d (N_ "Display version and exit")
-complete -c bc -s h -l help -d (N_ "Display help and exit")
+complete -c bc -s i -l interactive --description "Force interactive mode"
+complete -c bc -s l -l math-lib --description "Define math library"
+complete -c bc -s w -l warn --description "Give warnings for extensions to POSIX bc"
+complete -c bc -s s -l standard --description "Process exactly POSIX bc"
+complete -c bc -s q -l quiet --description "Do not print the GNU welcome"
+complete -c bc -s v -l version --description "Display version and exit"
+complete -c bc -s h -l help --description "Display help and exit"
diff --git a/share/completions/bunzip2.fish b/share/completions/bunzip2.fish
index 326ff6a6..33088cc2 100644
--- a/share/completions/bunzip2.fish
+++ b/share/completions/bunzip2.fish
@@ -6,10 +6,10 @@ complete -c bunzip2 -x -a "(
)
"
-complete -c bunzip2 -s c -l stdout -d (N_ "Decompress to stdout")
-complete -c bunzip2 -s f -l force -d (N_ "Overwrite")
-complete -c bunzip2 -s k -l keep -d (N_ "Do not overwrite")
-complete -c bunzip2 -s s -l small -d (N_ "Reduce memory usage")
-complete -c bunzip2 -s v -l verbose -d (N_ "Print compression ratios")
-complete -c bunzip2 -s L -l license -d (N_ "Print license")
-complete -c bunzip2 -s V -l version -d (N_ "Display version and exit")
+complete -c bunzip2 -s c -l stdout --description "Decompress to stdout"
+complete -c bunzip2 -s f -l force --description "Overwrite"
+complete -c bunzip2 -s k -l keep --description "Do not overwrite"
+complete -c bunzip2 -s s -l small --description "Reduce memory usage"
+complete -c bunzip2 -s v -l verbose --description "Print compression ratios"
+complete -c bunzip2 -s L -l license --description "Print license"
+complete -c bunzip2 -s V -l version --description "Display version and exit"
diff --git a/share/completions/bzcat.fish b/share/completions/bzcat.fish
index e357e29f..c9bb8f94 100644
--- a/share/completions/bzcat.fish
+++ b/share/completions/bzcat.fish
@@ -5,4 +5,4 @@ complete -c bzcat -x -a "(
__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
)
"
-complete -c bzcat -s s -l small -d (N_ "Reduce memory usage")
+complete -c bzcat -s s -l small --description "Reduce memory usage"
diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish
index b5193728..079cc55b 100644
--- a/share/completions/bzip2.fish
+++ b/share/completions/bzip2.fish
@@ -1,4 +1,4 @@
-complete -c bzip2 -s c -l stdout -d (N_ "Compress to stdout")
+complete -c bzip2 -s c -l stdout --description "Compress to stdout"
complete -c bzip2 -s d -l decompress -x -a "(
__fish_complete_suffix (commandline -ct) .bz 'Compressed file'
__fish_complete_suffix (commandline -ct) .bz2 'Compressed file'
@@ -6,14 +6,14 @@ complete -c bzip2 -s d -l decompress -x -a "(
__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
)
"
-complete -c bzip2 -s z -l compress -d (N_ "Compress file")
-complete -c bzip2 -s t -l test -d (N_ "Check integrity")
-complete -c bzip2 -s f -l force -d (N_ "Overwrite")
-complete -c bzip2 -s k -l keep -d (N_ "Do not overwrite")
-complete -c bzip2 -s s -l small -d (N_ "Reduce memory usage")
-complete -c bzip2 -s q -l quiet -d (N_ "Supress errors")
-complete -c bzip2 -s v -l verbose -d (N_ "Print compression ratios")
-complete -c bzip2 -s L -l license -d (N_ "Print license")
-complete -c bzip2 -s V -l version -d (N_ "Display version and exit")
-complete -c bzip2 -s 1 -l fast -d (N_ "Small block size")
-complete -c bzip2 -s 9 -l best -d (N_ "Large block size")
+complete -c bzip2 -s z -l compress --description "Compress file"
+complete -c bzip2 -s t -l test --description "Check integrity"
+complete -c bzip2 -s f -l force --description "Overwrite"
+complete -c bzip2 -s k -l keep --description "Do not overwrite"
+complete -c bzip2 -s s -l small --description "Reduce memory usage"
+complete -c bzip2 -s q -l quiet --description "Supress errors"
+complete -c bzip2 -s v -l verbose --description "Print compression ratios"
+complete -c bzip2 -s L -l license --description "Print license"
+complete -c bzip2 -s V -l version --description "Display version and exit"
+complete -c bzip2 -s 1 -l fast --description "Small block size"
+complete -c bzip2 -s 9 -l best --description "Large block size"
diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index d9274a11..30cf589f 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -1,12 +1,12 @@
-complete -c cat -s A -l show-all -d (N_ "Escape all non-printing characters")
-complete -c cat -s b -l number-nonblank -d (N_ "Number nonblank lines")
-complete -c cat -s e -d (N_ "Escape non-printing characters except tab")
-complete -c cat -s E -l show-ends -d (N_ "Display \$ at end of line")
-complete -c cat -s n -l number -d (N_ "Number all lines")
-complete -c cat -s s -l squeeze-blank -d (N_ "Never more than single blank line")
-complete -c cat -s t -d (N_ "Escape non-printing characters except newline")
-complete -c cat -s T -l show-tabs -d (N_ "Escape tab")
-complete -c cat -s v -d (N_ "Escape non-printing except newline and tab")
-complete -c cat -l help -d (N_ "Display help and exit")
-complete -c cat -l version -d (N_ "Display version and exit")
+complete -c cat -s A -l show-all --description "Escape all non-printing characters"
+complete -c cat -s b -l number-nonblank --description "Number nonblank lines"
+complete -c cat -s e --description "Escape non-printing characters except tab"
+complete -c cat -s E -l show-ends --description "Display \$ at end of line"
+complete -c cat -s n -l number --description "Number all lines"
+complete -c cat -s s -l squeeze-blank --description "Never more than single blank line"
+complete -c cat -s t --description "Escape non-printing characters except newline"
+complete -c cat -s T -l show-tabs --description "Escape tab"
+complete -c cat -s v --description "Escape non-printing except newline and tab"
+complete -c cat -l help --description "Display help and exit"
+complete -c cat -l version --description "Display version and exit"
diff --git a/share/completions/cdrecord.fish b/share/completions/cdrecord.fish
index e0a89195..cb1481d5 100644
--- a/share/completions/cdrecord.fish
+++ b/share/completions/cdrecord.fish
@@ -2,91 +2,91 @@
# Completions for Cdrecord
#
-complete -c cdrecord -o version -d (N_ "Display version and exit")
-complete -c cdrecord -s v -d (N_ "Increment the level of general verbosity by one")
-complete -c cdrecord -s V -d (N_ "Increment the verbose level in respect of SCSI command transport by one")
-complete -c cdrecord -a "debug={1,2,3,4,5}" -d (N_ "Set the misc debug value to #")
-complete -c cdrecord -s d -d (N_ "Increment the misc debug level by one") -a "1 2 3 4 5"
-complete -c cdrecord -s s -o silent -d (N_ "Do not print out a status report for failed SCSI commands")
-complete -c cdrecord -o force -d (N_ "Force to continue on some errors")
-complete -c cdrecord -o immed -d (N_ "Tell cdrecord to set the SCSI IMMED flag in certain commands")
-complete -c cdrecord -a "minbuf={25,35,45,55,65,75,85,95}" -d (N_ "Defines the minimum drive buffer fill ratio for the experimental ATAPI wait mode intended to free the IDE bus to allow hard disk and CD/DVD writer on the same IDE cable")
-complete -c cdrecord -o dummy -d (N_ "Complete CD/DVD-Recorder recording process with the laser turned off")
-complete -c cdrecord -o clone -d (N_ "Tells cdrecord to handle images created by readcd -clone")
+complete -c cdrecord -o version --description "Display version and exit"
+complete -c cdrecord -s v --description "Increment the level of general verbosity by one"
+complete -c cdrecord -s V --description "Increment the verbose level in respect of SCSI command transport by one"
+complete -c cdrecord -a "debug={1,2,3,4,5}" --description "Set the misc debug value to #"
+complete -c cdrecord -s d --description "Increment the misc debug level by one" -a "1 2 3 4 5"
+complete -c cdrecord -s s -o silent --description "Do not print out a status report for failed SCSI commands"
+complete -c cdrecord -o force --description "Force to continue on some errors"
+complete -c cdrecord -o immed --description "Tell cdrecord to set the SCSI IMMED flag in certain commands"
+complete -c cdrecord -a "minbuf={25,35,45,55,65,75,85,95}" --description "Defines the minimum drive buffer fill ratio for the experimental ATAPI wait mode intended to free the IDE bus to allow hard disk and CD/DVD writer on the same IDE cable"
+complete -c cdrecord -o dummy --description "Complete CD/DVD-Recorder recording process with the laser turned off"
+complete -c cdrecord -o clone --description "Tells cdrecord to handle images created by readcd -clone"
complete -c cdrecord -o dao
-complete -c cdrecord -o sao -d (N_ "Set SAO (Session At Once) mode, usually called Disk At Once mode")
-complete -c cdrecord -o tao -d (N_ "Set TAO (Track At Once) writing mode")
-complete -c cdrecord -o raw -d (N_ "Set RAW writing mode")
-complete -c cdrecord -o raw96r -d (N_ "Select Set RAW writing, the preferred raw writing mode")
-complete -c cdrecord -o raw96p -d (N_ "Select Set RAW writing, the less preferred raw writing mode")
-complete -c cdrecord -o raw16 -d (N_ "Select Set RAW writing, the preferred raw writing mode if raw96r is not supported")
-complete -c cdrecord -o multi -d (N_ "Allow multi session CDs to be made")
-complete -c cdrecord -o msinfo -d (N_ "Retrieve multi session info in a form suitable for mkisofs-1.10 or later")
-complete -c cdrecord -o toc -d (N_ "Retrieve and print out the table of content or PMA of a CD")
-complete -c cdrecord -o atip -d (N_ "Retrieve and print out the ATIP (absolute Time in Pre-groove) info")
-complete -c cdrecord -o fix -d (N_ "The disk will only be fixated")
-complete -c cdrecord -o nofix -d (N_ "Do not fixate the disk after writing the tracks")
-complete -c cdrecord -o waiti -d (N_ "Wait for input to become available on standard input before trying to open the SCSI driver")
-complete -c cdrecord -o load -d (N_ "Load the media and exit")
-complete -c cdrecord -o lock -d (N_ "Load the media, lock the door and exit")
-complete -c cdrecord -o eject -d (N_ "Eject disk after doing the work")
-complete -c cdrecord -a "speed={0,150,172,1385}" -d (N_ "Set the speed factor of the writing process to #")
-complete -c cdrecord -a "blank={help,all,fast,track,unreserve,trtail,unclose,session}" -d (N_ "Blank a CD-RW and exit or blank a CD-RW before writing")
-complete -c cdrecord -o format -d (N_ "Format a CD-RW/DVD-RW/DVD+RW disc")
-complete -c cdrecord -a "fs=" -d (N_ "Set the FIFO (ring buffer) size to #")
-complete -c cdrecord -a "ts=" -d (N_ "Set the maximum transfer size for a single SCSI command to #")
-complete -c cdrecord -a "dev=" -d (N_ "Sets the SCSI target for the CD/DVD-Recorder")
-complete -c cdrecord -a "gracetime=" -d (N_ "Set the grace time before starting to write to ># seconds")
-complete -c cdrecord -a "timeout=" -d (N_ "Set the default SCSI command timeout value to # seconds")
-complete -c cdrecord -a "driver={help,mmc_cd,mmc_cd_dvd,mmc_cdr,mmc_cdr_sony,mmc_dvd,mmc_dvdplus,mmc_dvdplusr,mmc_dvdplusrw,cw_7501,kodak_pcd_600,philips_cdd521,philips_cdd521_old,philips_cdd522,philips_dumb,pioneer_dws114x,plasmon_rf4100,ricoh_ro1060c,ricoh_ro1420c,scsi2_cd,sony_cdu924,teac_cdr50,tyuden_ew50,yamaha_cdr100,cdr_simul,dvd_simul}" -d (N_ "Allows the user to manually select a driver for the device")
+complete -c cdrecord -o sao --description "Set SAO (Session At Once) mode, usually called Disk At Once mode"
+complete -c cdrecord -o tao --description "Set TAO (Track At Once) writing mode"
+complete -c cdrecord -o raw --description "Set RAW writing mode"
+complete -c cdrecord -o raw96r --description "Select Set RAW writing, the preferred raw writing mode"
+complete -c cdrecord -o raw96p --description "Select Set RAW writing, the less preferred raw writing mode"
+complete -c cdrecord -o raw16 --description "Select Set RAW writing, the preferred raw writing mode if raw96r is not supported"
+complete -c cdrecord -o multi --description "Allow multi session CDs to be made"
+complete -c cdrecord -o msinfo --description "Retrieve multi session info in a form suitable for mkisofs-1.10 or later"
+complete -c cdrecord -o toc --description "Retrieve and print out the table of content or PMA of a CD"
+complete -c cdrecord -o atip --description "Retrieve and print out the ATIP (absolute Time in Pre-groove) info"
+complete -c cdrecord -o fix --description "The disk will only be fixated"
+complete -c cdrecord -o nofix --description "Do not fixate the disk after writing the tracks"
+complete -c cdrecord -o waiti --description "Wait for input to become available on standard input before trying to open the SCSI driver"
+complete -c cdrecord -o load --description "Load the media and exit"
+complete -c cdrecord -o lock --description "Load the media, lock the door and exit"
+complete -c cdrecord -o eject --description "Eject disk after doing the work"
+complete -c cdrecord -a "speed={0,150,172,1385}" --description "Set the speed factor of the writing process to #"
+complete -c cdrecord -a "blank={help,all,fast,track,unreserve,trtail,unclose,session}" --description "Blank a CD-RW and exit or blank a CD-RW before writing"
+complete -c cdrecord -o format --description "Format a CD-RW/DVD-RW/DVD+RW disc"
+complete -c cdrecord -a "fs=" --description "Set the FIFO (ring buffer) size to #"
+complete -c cdrecord -a "ts=" --description "Set the maximum transfer size for a single SCSI command to #"
+complete -c cdrecord -a "dev=" --description "Sets the SCSI target for the CD/DVD-Recorder"
+complete -c cdrecord -a "gracetime=" --description "Set the grace time before starting to write to ># seconds"
+complete -c cdrecord -a "timeout=" --description "Set the default SCSI command timeout value to # seconds"
+complete -c cdrecord -a "driver={help,mmc_cd,mmc_cd_dvd,mmc_cdr,mmc_cdr_sony,mmc_dvd,mmc_dvdplus,mmc_dvdplusr,mmc_dvdplusrw,cw_7501,kodak_pcd_600,philips_cdd521,philips_cdd521_old,philips_cdd522,philips_dumb,pioneer_dws114x,plasmon_rf4100,ricoh_ro1060c,ricoh_ro1420c,scsi2_cd,sony_cdu924,teac_cdr50,tyuden_ew50,yamaha_cdr100,cdr_simul,dvd_simul}" --description "Allows the user to manually select a driver for the device"
# TODO: This argument accepts a comma separated list of arguments
-complete -c cdrecord -a "driveropts=" -d (N_ "Set driver specific options")
-complete -c cdrecord -o setdropts -d (N_ "Set the driveropts specified by driveropts=option list, the speed of the drive and the dummy flag and exit")
-complete -c cdrecord -o checkdrive -d (N_ "Checks if a driver for the current drive is present and exit")
-complete -c cdrecord -o prcap -d (N_ "Print the drive capabilities for SCSI-3/mmc compliant drives as obtained from mode page 0x2A")
-complete -c cdrecord -o inq -d (N_ "Do an inquiry for the drive, print the inquiry info and exit")
-complete -c cdrecord -o scanbus -d (N_ "Scan all SCSI devices on all SCSI busses and print the inquiry strings")
-complete -c cdrecord -o reset -d (N_ "Try to reset the SCSI bus where the CD recorder is located")
-complete -c cdrecord -o abort -d (N_ "Try to send an abort sequence to the drive")
-complete -c cdrecord -o overburn -d (N_ "Allow cdrecord to write more than the official size of a medium")
-complete -c cdrecord -o ignsize -d (N_ "Ignore the known size of the medium, use for debugging only")
-complete -c cdrecord -o useinfo -d (N_ "Use *.inf files to overwrite audio options")
-complete -c cdrecord -a "defpregap=" -d (N_ "Set the default pre-gap size for all tracks except track nr 1")
-complete -c cdrecord -o packet -d (N_ "Set Packet writing mode (experimental interface)")
-complete -c cdrecord -a "pktsize=" -d (N_ "Set the packet size to #, forces fixed packet mode (experimental)")
-complete -c cdrecord -o noclose -d (N_ "Do not close the current track, only when in packet writing mode (experimental)")
-complete -c cdrecord -a "mcn=" -d (N_ "Set the Media Catalog Number of the CD")
-complete -c cdrecord -o text -d (N_ "Write CD-Text info based on info taken from a file that contains ascii info for the text strings")
-complete -c cdrecord -a "textfile=" -d (N_ "Write CD-Text based on info found in the binary file filename")
-complete -c cdrecord -a "cuefile=" -d (N_ "Take all recording related info from a CDRWIN compliant CUE sheet file")
+complete -c cdrecord -a "driveropts=" --description "Set driver specific options"
+complete -c cdrecord -o setdropts --description "Set the driveropts specified by driveropts=option list, the speed of the drive and the dummy flag and exit"
+complete -c cdrecord -o checkdrive --description "Checks if a driver for the current drive is present and exit"
+complete -c cdrecord -o prcap --description "Print the drive capabilities for SCSI-3/mmc compliant drives as obtained from mode page 0x2A"
+complete -c cdrecord -o inq --description "Do an inquiry for the drive, print the inquiry info and exit"
+complete -c cdrecord -o scanbus --description "Scan all SCSI devices on all SCSI busses and print the inquiry strings"
+complete -c cdrecord -o reset --description "Try to reset the SCSI bus where the CD recorder is located"
+complete -c cdrecord -o abort --description "Try to send an abort sequence to the drive"
+complete -c cdrecord -o overburn --description "Allow cdrecord to write more than the official size of a medium"
+complete -c cdrecord -o ignsize --description "Ignore the known size of the medium, use for debugging only"
+complete -c cdrecord -o useinfo --description "Use *.inf files to overwrite audio options"
+complete -c cdrecord -a "defpregap=" --description "Set the default pre-gap size for all tracks except track nr 1"
+complete -c cdrecord -o packet --description "Set Packet writing mode (experimental interface)"
+complete -c cdrecord -a "pktsize=" --description "Set the packet size to #, forces fixed packet mode (experimental)"
+complete -c cdrecord -o noclose --description "Do not close the current track, only when in packet writing mode (experimental)"
+complete -c cdrecord -a "mcn=" --description "Set the Media Catalog Number of the CD"
+complete -c cdrecord -o text --description "Write CD-Text info based on info taken from a file that contains ascii info for the text strings"
+complete -c cdrecord -a "textfile=" --description "Write CD-Text based on info found in the binary file filename"
+complete -c cdrecord -a "cuefile=" --description "Take all recording related info from a CDRWIN compliant CUE sheet file"
# These completions are TRACK OPTIONS
-complete -c cdrecord -a "isrc=" -d (N_ "Set the International Standard Recording Number for the next track")
-complete -c cdrecord -a "index=" -d (N_ "Sets an index list for the next track")
-complete -c cdrecord -o audio -d (N_ "All subsequent tracks are written in CD-DA audio format")
-complete -c cdrecord -o swab -d (N_ "Audio data is assumed to be in byte-swapped (little-endian) order")
-complete -c cdrecord -o data -d (N_ "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format")
-complete -c cdrecord -o mode2 -d (N_ "All subsequent tracks are written in CD-ROM mode 2 format")
-complete -c cdrecord -o xa -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format")
-complete -c cdrecord -o xa1 -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format")
-complete -c cdrecord -o xa2 -d (N_ "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format")
-complete -c cdrecord -o xamix -d (N_ "All subsequent tracks are written in a way that allows a mix of CD-ROM XA mode 2 form 1/2 format")
-complete -c cdrecord -o cdi -d (N_ "The TOC type for the disk is set to CDI, with XA only")
-complete -c cdrecord -o isosize -d (N_ "Use the ISO-9660 file system size as the size of the next track")
-complete -c cdrecord -o pad -d (N_ "15 sectors of zeroed data will be added to the end of this and each subsequent data track")
-complete -c cdrecord -a "padsize=" -d (N_ "Set the amount of data to be appended as padding to the next track")
-complete -c cdrecord -o nopad -d (N_ "Do not pad the following tracks - the default")
-complete -c cdrecord -o shorttrack -d (N_ "Allow all subsequent tracks to violate the Red Book track length standard (min 4 s)")
-complete -c cdrecord -o noshorttrack -d (N_ "Re-enforce the Red Book track length standard (min 4 s)")
-complete -c cdrecord -a "pregap=" -d (N_ "Set the pre-gap size for the next track")
-complete -c cdrecord -o preemp -d (N_ "All TOC entries for subsequent audio tracks will indicate that the audio data has been sampled with 50/15 microsec pre-emphasis")
-complete -c cdrecord -o nopreemp -d (N_ "All TOC entries for subsequent audio tracks will indicate that the audio data has been mastered with linear data")
-complete -c cdrecord -o copy -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied without limit")
-complete -c cdrecord -o nocopy -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied only once for personal use")
-complete -c cdrecord -o scms -d (N_ "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has no permission to be copied")
-complete -c cdrecord -a "tsize=" -d (N_ "If the master image for the next track has been stored on a raw disk, use this option to specify the valid amount of data on this disk")
+complete -c cdrecord -a "isrc=" --description "Set the International Standard Recording Number for the next track"
+complete -c cdrecord -a "index=" --description "Sets an index list for the next track"
+complete -c cdrecord -o audio --description "All subsequent tracks are written in CD-DA audio format"
+complete -c cdrecord -o swab --description "Audio data is assumed to be in byte-swapped (little-endian) order"
+complete -c cdrecord -o data --description "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format"
+complete -c cdrecord -o mode2 --description "All subsequent tracks are written in CD-ROM mode 2 format"
+complete -c cdrecord -o xa --description "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
+complete -c cdrecord -o xa1 --description "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
+complete -c cdrecord -o xa2 --description "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format"
+complete -c cdrecord -o xamix --description "All subsequent tracks are written in a way that allows a mix of CD-ROM XA mode 2 form 1/2 format"
+complete -c cdrecord -o cdi --description "The TOC type for the disk is set to CDI, with XA only"
+complete -c cdrecord -o isosize --description "Use the ISO-9660 file system size as the size of the next track"
+complete -c cdrecord -o pad --description "15 sectors of zeroed data will be added to the end of this and each subsequent data track"
+complete -c cdrecord -a "padsize=" --description "Set the amount of data to be appended as padding to the next track"
+complete -c cdrecord -o nopad --description "Do not pad the following tracks - the default"
+complete -c cdrecord -o shorttrack --description "Allow all subsequent tracks to violate the Red Book track length standard (min 4 s)"
+complete -c cdrecord -o noshorttrack --description "Re-enforce the Red Book track length standard (min 4 s)"
+complete -c cdrecord -a "pregap=" --description "Set the pre-gap size for the next track"
+complete -c cdrecord -o preemp --description "All TOC entries for subsequent audio tracks will indicate that the audio data has been sampled with 50/15 microsec pre-emphasis"
+complete -c cdrecord -o nopreemp --description "All TOC entries for subsequent audio tracks will indicate that the audio data has been mastered with linear data"
+complete -c cdrecord -o copy --description "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied without limit"
+complete -c cdrecord -o nocopy --description "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied only once for personal use"
+complete -c cdrecord -o scms --description "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has no permission to be copied"
+complete -c cdrecord -a "tsize=" --description "If the master image for the next track has been stored on a raw disk, use this option to specify the valid amount of data on this disk"
diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index fae3a4fe..14e565b1 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -1,12 +1,12 @@
-complete -c chgrp -s c -l changes -d (N_ "Output diagnostic for changed files")
-complete -c chgrp -l dereference -d (N_ "Dereferense symbolic links")
-complete -c chgrp -s h -l no-dereference -d (N_ "Do not dereference symbolic links")
-complete -c chgrp -l from -d (N_ "Change from owner/group")
-complete -c chgrp -s f -l silent -d (N_ "Supress errors")
-complete -c chgrp -l reference -d (N_ "Use same owner/group as file") -r
-complete -c chgrp -s R -l recursive -d (N_ "Operate recursively")
-complete -c chgrp -s v -l verbose -d (N_ "Output diagnostic for every file")
-complete -c chgrp -s h -l help -d (N_ "Display help and exit")
-complete -c chgrp -l version -d (N_ "Display version and exit")
+complete -c chgrp -s c -l changes --description "Output diagnostic for changed files"
+complete -c chgrp -l dereference --description "Dereferense symbolic links"
+complete -c chgrp -s h -l no-dereference --description "Do not dereference symbolic links"
+complete -c chgrp -l from --description "Change from owner/group"
+complete -c chgrp -s f -l silent --description "Supress errors"
+complete -c chgrp -l reference --description "Use same owner/group as file" -r
+complete -c chgrp -s R -l recursive --description "Operate recursively"
+complete -c chgrp -s v -l verbose --description "Output diagnostic for every file"
+complete -c chgrp -s h -l help --description "Display help and exit"
+complete -c chgrp -l version --description "Display version and exit"
complete -c chgrp -d Group -a "(__fish_complete_groups)"
diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index 29c22eff..cf59f155 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -1,12 +1,12 @@
-complete -c chown -s c -l changes -d (N_ "Output diagnostic for changed files")
-complete -c chown -l dereference -d (N_ "Dereferense symbolic links")
-complete -c chown -s h -l no-dereference -d (N_ "Do not dereference symbolic links")
-complete -c chown -l from -d (N_ "Change from owner/group")
-complete -c chown -s f -l silent -d (N_ "Supress errors")
-complete -c chown -l reference -d (N_ "Use same owner/group as file") -r
-complete -c chown -s R -l recursive -d (N_ "Operate recursively")
-complete -c chown -s v -l verbose -d (N_ "Output diagnostic for every file")
-complete -c chown -s h -l help -d (N_ "Display help and exit")
-complete -c chown -l version -d (N_ "Display version and exit")
-complete -c chown -d (N_ "Username") -a "(__fish_print_users):"
-complete -c chown -d (N_ "Username") -a "(echo (commandline -ct)|sgrep -o '.*:')(cat /etc/group |cut -d : -f 1)"
+complete -c chown -s c -l changes --description "Output diagnostic for changed files"
+complete -c chown -l dereference --description "Dereferense symbolic links"
+complete -c chown -s h -l no-dereference --description "Do not dereference symbolic links"
+complete -c chown -l from --description "Change from owner/group"
+complete -c chown -s f -l silent --description "Supress errors"
+complete -c chown -l reference --description "Use same owner/group as file" -r
+complete -c chown -s R -l recursive --description "Operate recursively"
+complete -c chown -s v -l verbose --description "Output diagnostic for every file"
+complete -c chown -s h -l help --description "Display help and exit"
+complete -c chown -l version --description "Display version and exit"
+complete -c chown --description "Username" -a "(__fish_print_users):"
+complete -c chown --description "Username" -a "(echo (commandline -ct)|sgrep -o '.*:')(cat /etc/group |cut -d : -f 1)"
diff --git a/share/completions/commandline.fish b/share/completions/commandline.fish
index 476df8e6..70665995 100644
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -1,17 +1,17 @@
-complete -c commandline -s h -l help -d (N_ "Display help and exit")
-complete -c commandline -s a -l append -d (N_ "Add text to the end of the selected area")
-complete -c commandline -s i -l insert -d (N_ "Add text at cursor")
-complete -c commandline -s r -l replace -d (N_ "Replace selected part")
+complete -c commandline -s h -l help --description "Display help and exit"
+complete -c commandline -s a -l append --description "Add text to the end of the selected area"
+complete -c commandline -s i -l insert --description "Add text at cursor"
+complete -c commandline -s r -l replace --description "Replace selected part"
-complete -c commandline -s j -l current-job -d (N_ "Select job under cursor")
-complete -c commandline -s p -l current-process -d (N_ "Select process under cursor")
-complete -c commandline -s t -l current-token -d (N_ "Select token under cursor")
-complete -c commandline -s b -l current-buffer -d (N_ "Select entire command line (default)")
+complete -c commandline -s j -l current-job --description "Select job under cursor"
+complete -c commandline -s p -l current-process --description "Select process under cursor"
+complete -c commandline -s t -l current-token --description "Select token under cursor"
+complete -c commandline -s b -l current-buffer --description "Select entire command line (default)"
-complete -c commandline -s c -l cut-at-cursor -d (N_ "Only return that part of the command line before the cursor")
-complete -c commandline -s f -l function -d (N_ "Inject readline functions to reader")
+complete -c commandline -s c -l cut-at-cursor --description "Only return that part of the command line before the cursor"
+complete -c commandline -s f -l function --description "Inject readline functions to reader"
-complete -c commandline -s I -l input -d (N_ "Specify command to operate on")
-complete -c commandline -s C -l cursor -d (N_ "Set/get cursor position, not buffer contents")
+complete -c commandline -s I -l input --description "Specify command to operate on"
+complete -c commandline -s C -l cursor --description "Set/get cursor position, not buffer contents"
diff --git a/share/completions/complete.fish b/share/completions/complete.fish
index 9681ee3e..ebd6d72f 100644
--- a/share/completions/complete.fish
+++ b/share/completions/complete.fish
@@ -1,15 +1,15 @@
-complete -c complete -s c -l command -d (N_ "Command to add completion to") -r
-complete -c complete -s p -l path -d (N_ "Path to add completion to")
-complete -c complete -s s -l short-option -d (N_ "Posix-style option to complete")
-complete -c complete -s l -l long-option -d (N_ "GNU-style option to complete")
-complete -c complete -s o -l old-option -d (N_ "Old style long option to complete")
-complete -c complete -s f -l no-files -d (N_ "Do not use file completion")
-complete -c complete -s r -l require-parameter -d (N_ "Require parameter")
-complete -c complete -s x -l exclusive -d (N_ "Require parameter and do not use file completion")
-complete -c complete -s a -l arguments -d (N_ "A list of possible arguments")
-complete -c complete -s d -l description -d (N_ "Description of this completions")
-complete -c complete -s u -l unauthorative -d (N_ "Option list is not complete")
-complete -c complete -s e -l erase -d (N_ "Remove completion")
-complete -c complete -s h -l help -d (N_ "Display help and exit")
-complete -c complete -s C -l do-complete -d (N_ "Print all completions for the specified commandline")
-complete -c complete -s n -l condition -d (N_ "The completion should only be used if the specified command has a zero exit status") -r
+complete -c complete -s c -l command --description "Command to add completion to" -r
+complete -c complete -s p -l path --description "Path to add completion to"
+complete -c complete -s s -l short-option --description "Posix-style option to complete"
+complete -c complete -s l -l long-option --description "GNU-style option to complete"
+complete -c complete -s o -l old-option --description "Old style long option to complete"
+complete -c complete -s f -l no-files --description "Do not use file completion"
+complete -c complete -s r -l require-parameter --description "Require parameter"
+complete -c complete -s x -l exclusive --description "Require parameter and do not use file completion"
+complete -c complete -s a -l arguments --description "A list of possible arguments"
+complete -c complete -s d -l description --description "Description of this completions"
+complete -c complete -s u -l unauthorative --description "Option list is not complete"
+complete -c complete -s e -l erase --description "Remove completion"
+complete -c complete -s h -l help --description "Display help and exit"
+complete -c complete -s C -l do-complete --description "Print all completions for the specified commandline"
+complete -c complete -s n -l condition --description "The completion should only be used if the specified command has a zero exit status" -r
diff --git a/share/completions/configure.fish b/share/completions/configure.fish
index c05fee3a..7c7d849c 100644
--- a/share/completions/configure.fish
+++ b/share/completions/configure.fish
@@ -1,12 +1,12 @@
-complete -c configure -s h -l help -x -a "short recursive" -d (N_ "Display help and exit")
-complete -c configure -s V -l version -d (N_ "Display version and exit")
-complete -c configure -s q -l quiet -d (N_ "Quiet mode")
-complete -c configure -l cache-file -f -d (N_ "Cache test results in specified file")
-complete -c configure -s C -l config-cache -d (N_ "Cache test results in file config.cache")
-complete -c configure -s n -l no-create -d (N_ "Do not create output files")
-complete -c configure -l srcdir -d (N_ "Set source directory") -a "__fish_complete_directories (commandline -ct)" -x
-complete -c configure -l prefix -d (N_ "Architecture-independent install directory") -a "__fish_complete_directories (commandline -ct)" -x
-complete -c configure -l exec-prefix -d (N_ "Architecture-dependent install directory") -a "__fish_complete_directories (commandline -ct)" -x
-complete -c configure -l build -d (N_ "Configure for building on BUILD") -x
-complete -c configure -l host -d (N_ "Cross-compile to build programs to run on HOST") -x
-complete -c configure -l target -d (N_ "Configure for building compilers for TARGET") -x -u
+complete -c configure -s h -l help -x -a "short recursive" --description "Display help and exit"
+complete -c configure -s V -l version --description "Display version and exit"
+complete -c configure -s q -l quiet --description "Quiet mode"
+complete -c configure -l cache-file -f --description "Cache test results in specified file"
+complete -c configure -s C -l config-cache --description "Cache test results in file config.cache"
+complete -c configure -s n -l no-create --description "Do not create output files"
+complete -c configure -l srcdir --description "Set source directory" -a "__fish_complete_directories (commandline -ct)" -x
+complete -c configure -l prefix --description "Architecture-independent install directory" -a "__fish_complete_directories (commandline -ct)" -x
+complete -c configure -l exec-prefix --description "Architecture-dependent install directory" -a "__fish_complete_directories (commandline -ct)" -x
+complete -c configure -l build --description "Configure for building on BUILD" -x
+complete -c configure -l host --description "Cross-compile to build programs to run on HOST" -x
+complete -c configure -l target --description "Configure for building compilers for TARGET" -x -u
diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 6c34cf01..0415bd86 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -1,28 +1,28 @@
-complete -c cp -s a -l archive -d (N_ "Same as -dpR")
-complete -c cp -s b -l backup -d (N_ "Make backup of each existing destination file") -a "none off numbered t existing nil simple never"
-complete -c cp -l copy-contents -d (N_ "Copy contents of special files when recursive")
-complete -c cp -s d -d (N_ "Same as --no-dereference --preserve=link")
-complete -c cp -s f -l force -d (N_ "Do not prompt before overwriting")
-complete -c cp -s i -l interactive -d (N_ "Prompt before overwrite")
-complete -c cp -s H -d (N_ "Follow command-line symbolic links")
-complete -c cp -s l -l link -d (N_ "Link files instead of copying")
-complete -c cp -l strip-trailing-slashes -d (N_ "Remove trailing slashes from source")
-complete -c cp -s S -l suffix -r -d (N_ "Backup suffix")
-complete -c cp -s t -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
-complete -c cp -s u -l update -d (N_ "Do not overwrite newer files")
-complete -c cp -s v -l verbose -d (N_ "Verbose mode")
-complete -c cp -l help -d (N_ "Display help and exit")
-complete -c cp -l version -d (N_ "Display version and exit")
-complete -c cp -s L -l dereference -d (N_ "Always follow symbolic links")
-complete -c cp -s P -l no-dereference -d (N_ "Never follow symbolic links")
-complete -c cp -s p -d (N_ "Same as --preserve=mode,ownership,timestamps")
-complete -c cp -l preserve -d (N_ "Preserve the specified attributes and security contexts, if possible") -a "mode ownership timestamps links all"
-complete -c cp -l no-preserve -r -d (N_ "Don't preserve the specified attributes") -a "mode ownership timestamps links all"
-complete -c cp -l parents -d (N_ "Use full source file name under DIRECTORY")
-complete -c cp -s r -s R -l recursive -d (N_ "Copy directories recursively")
-complete -c cp -l remove-destination -d (N_ "Remove each existing destination file before attempting to open it (contrast with --force)")
-complete -c cp -l sparse -r -d (N_ "Control creation of sparse files") -a "always auto never"
-complete -c cp -s s -l symbolic-link -d (N_ "Make symbolic links instead of copying")
-complete -c cp -s T -l no-target-directory -d (N_ "Treat DEST as a normal file")
-complete -c cp -s x -l one-file-system -d (N_ "Stay on this file system")
-complete -c cp -s X -l context -r -d (N_ "Set security context of copy to CONTEXT")
+complete -c cp -s a -l archive --description "Same as -dpR"
+complete -c cp -s b -l backup --description "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
+complete -c cp -l copy-contents --description "Copy contents of special files when recursive"
+complete -c cp -s d --description "Same as --no-dereference --preserve=link"
+complete -c cp -s f -l force --description "Do not prompt before overwriting"
+complete -c cp -s i -l interactive --description "Prompt before overwrite"
+complete -c cp -s H --description "Follow command-line symbolic links"
+complete -c cp -s l -l link --description "Link files instead of copying"
+complete -c cp -l strip-trailing-slashes --description "Remove trailing slashes from source"
+complete -c cp -s S -l suffix -r --description "Backup suffix"
+complete -c cp -s t -l target-directory --description "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
+complete -c cp -s u -l update --description "Do not overwrite newer files"
+complete -c cp -s v -l verbose --description "Verbose mode"
+complete -c cp -l help --description "Display help and exit"
+complete -c cp -l version --description "Display version and exit"
+complete -c cp -s L -l dereference --description "Always follow symbolic links"
+complete -c cp -s P -l no-dereference --description "Never follow symbolic links"
+complete -c cp -s p --description "Same as --preserve=mode,ownership,timestamps"
+complete -c cp -l preserve --description "Preserve the specified attributes and security contexts, if possible" -a "mode ownership timestamps links all"
+complete -c cp -l no-preserve -r --description "Don't preserve the specified attributes" -a "mode ownership timestamps links all"
+complete -c cp -l parents --description "Use full source file name under DIRECTORY"
+complete -c cp -s r -s R -l recursive --description "Copy directories recursively"
+complete -c cp -l remove-destination --description "Remove each existing destination file before attempting to open it (contrast with --force)"
+complete -c cp -l sparse -r --description "Control creation of sparse files" -a "always auto never"
+complete -c cp -s s -l symbolic-link --description "Make symbolic links instead of copying"
+complete -c cp -s T -l no-target-directory --description "Treat DEST as a normal file"
+complete -c cp -s x -l one-file-system --description "Stay on this file system"
+complete -c cp -s X -l context -r --description "Set security context of copy to CONTEXT"
diff --git a/share/completions/cut.fish b/share/completions/cut.fish
index 7cf5cd97..006c17e7 100644
--- a/share/completions/cut.fish
+++ b/share/completions/cut.fish
@@ -1,10 +1,10 @@
-complete -c cut -s b -l bytes -x -d (N_ "Output byte range")
-complete -c cut -s c -l characters -x -d (N_ "Output character range")
-complete -c cut -s d -l delimiter -x -d (N_ "Select field delimiter")
-complete -c cut -s d -l fields -x -d (N_ "Select fields")
-complete -c cut -s n -d (N_ "Dont split mutibyte characters")
-complete -c cut -s s -l only-delimited -d (N_ "Do not print lines without delimiter")
-complete -c cut -l output-delimiter -d (N_ "Select output delimiter")
-complete -c cut -l help -d (N_ "Display help and exit")
-complete -c cut -l version -d (N_ "Display version and exit")
+complete -c cut -s b -l bytes -x --description "Output byte range"
+complete -c cut -s c -l characters -x --description "Output character range"
+complete -c cut -s d -l delimiter -x --description "Select field delimiter"
+complete -c cut -s d -l fields -x --description "Select fields"
+complete -c cut -s n --description "Dont split mutibyte characters"
+complete -c cut -s s -l only-delimited --description "Do not print lines without delimiter"
+complete -c cut -l output-delimiter --description "Select output delimiter"
+complete -c cut -l help --description "Display help and exit"
+complete -c cut -l version --description "Display version and exit"
diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index 0c911cb2..771affaf 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -57,39 +57,39 @@ complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watchers\t"'(_ "See who is wa
#
complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root -d (N_ "Specify legal cvsroot directory." )
-complete -c cvs -n '__fish_no_cvs_subcommand' -s a -d (N_ "Authenticate all net traffic")
-complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T -d (N_ "Use "tmpdir" for temporary files")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d -d (N_ "Overrides $CVSROOT as the root of the CVS tree")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s e -d (N_ "Use "editor" for editing log information")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s f -d (N_ "Do not use the ~/.cvsrc file")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s H -d (N_ "Displays usage information for command")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s n -d (N_ "Do not change any files")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s Q -d (N_ "Cause CVS to be really quiet")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s R -d (N_ "Read-only repository mode")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s q -d (N_ "Cause CVS to be somewhat quiet")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s r -d (N_ "Make checked-out files read-only")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s s -d (N_ "Set CVS user variable")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s t -d (N_ "Show trace of program execution -- try with -n")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s v -d (N_ "Display version and exit")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s w -d (N_ "Make checked-out files read-write (default)")
-complete -c cvs -n '__fish_no_cvs_subcommand' -s x -d (N_ "Encrypt all net traffic")
-complete -c cvs -n '__fish_no_cvs_subcommand' -x -s z -d (N_ "Compression level for net traffic") -a '1 2 3 4 5 6 7 8 9'
+complete -c cvs -n '__fish_no_cvs_subcommand' -s a --description "Authenticate all net traffic"
+complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T --description "Use "tmpdir" for temporary files"
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d --description "Overrides $CVSROOT as the root of the CVS tree"
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s e --description "Use "editor" for editing log information"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s f --description "Do not use the ~/.cvsrc file"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s H --description "Displays usage information for command"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s n --description "Do not change any files"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s Q --description "Cause CVS to be really quiet"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s R --description "Read-only repository mode"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s q --description "Cause CVS to be somewhat quiet"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s r --description "Make checked-out files read-only"
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s s --description "Set CVS user variable"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s t --description "Show trace of program execution -- try with -n"
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s v --description "Display version and exit"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s w --description "Make checked-out files read-write (default)"
+complete -c cvs -n '__fish_no_cvs_subcommand' -s x --description "Encrypt all net traffic"
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s z --description "Compression level for net traffic" -a '1 2 3 4 5 6 7 8 9'
#
# Universal cvs options, which can be applied to any cvs command.
#
-complete -c cvs -n '__fish_seen_subcommand_from checkout diff export history rdiff rtag update' -x -s D -d (N_ "Use the most recent revision no later than date")
-complete -c cvs -n '__fish_seen_subcommand_from annotate export rdiff rtag update' -s f -d (N_ "Retrieve files even when no match for tag/date")
-complete -c cvs -n '__fish_seen_subcommand_from add checkout diff import update' -x -s k -d (N_ "Alter default keyword processing")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export log rdiff remove rtag status tag unedit update watch watchers' -s l -d (N_ "Don't recurse")
-complete -c cvs -n '__fish_seen_subcommand_from add commit import' -x -s m -d (N_ "Specify log message instead of invoking editor")
-complete -c cvs -n '__fish_seen_subcommand_from checkout commit export rtag' -s n -d (N_ "Don't run any tag programs")
-complete -c cvs -n 'not __fish_no_cvs_subcommand' -s P -d (N_ "Prune empty directories")
-complete -c cvs -n '__fish_seen_subcommand_from checkout update' -s p -d (N_ "Pipe files to stdout")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export rdiff remove rtag status tag unedit update watch watchers' -s R -d (N_ "Process directories recursively")
-complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff history export rdiff rtag update' -x -s r -d (N_ "Use a specified tag")
-complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W -d (N_ "Specify filenames to be filtered")
+complete -c cvs -n '__fish_seen_subcommand_from checkout diff export history rdiff rtag update' -x -s D --description "Use the most recent revision no later than date"
+complete -c cvs -n '__fish_seen_subcommand_from annotate export rdiff rtag update' -s f --description "Retrieve files even when no match for tag/date"
+complete -c cvs -n '__fish_seen_subcommand_from add checkout diff import update' -x -s k --description "Alter default keyword processing"
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export log rdiff remove rtag status tag unedit update watch watchers' -s l --description "Don't recurse"
+complete -c cvs -n '__fish_seen_subcommand_from add commit import' -x -s m --description "Specify log message instead of invoking editor"
+complete -c cvs -n '__fish_seen_subcommand_from checkout commit export rtag' -s n --description "Don't run any tag programs"
+complete -c cvs -n 'not __fish_no_cvs_subcommand' -s P --description "Prune empty directories"
+complete -c cvs -n '__fish_seen_subcommand_from checkout update' -s p --description "Pipe files to stdout"
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff edit editors export rdiff remove rtag status tag unedit update watch watchers' -s R --description "Process directories recursively"
+complete -c cvs -n '__fish_seen_subcommand_from annotate checkout commit diff history export rdiff rtag update' -x -s r --description "Use a specified tag"
+complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W --description "Specify filenames to be filtered"
#
# cvs options for admin. Note that all options marked as "useless", "might not
@@ -97,90 +97,90 @@ complete -c cvs -n '__fish_seen_subcommand_from import update' -r -s W -d (N_ "S
#
set -l admin_opt -c cvs -n 'contains admin (commandline -poc)'
-complete $admin_opt -x -s k -d (N_ "Set the default keyword substitution")
-complete $admin_opt -s l -d (N_ "Lock a revision")
-complete $admin_opt -x -s m -d (N_ "Replace a log message")
-complete $admin_opt -x -s n -d (N_ "Force name/rev association")
-complete $admin_opt -x -s N -d (N_ "Make a name/rev association")
-complete $admin_opt -s q -d (N_ "Run quietly")
-complete $admin_opt -x -s s -d (N_ "Set a state attribute for a revision")
-complete $admin_opt -s t -d (N_ "Write descriptive text from a file into RCS")
-complete $admin_opt -x -o t- -d (N_ "Write descriptive text into RCS")
-complete $admin_opt -x -s l -d (N_ "Unlock a revision")
+complete $admin_opt -x -s k --description "Set the default keyword substitution"
+complete $admin_opt -s l --description "Lock a revision"
+complete $admin_opt -x -s m --description "Replace a log message"
+complete $admin_opt -x -s n --description "Force name/rev association"
+complete $admin_opt -x -s N --description "Make a name/rev association"
+complete $admin_opt -s q --description "Run quietly"
+complete $admin_opt -x -s s --description "Set a state attribute for a revision"
+complete $admin_opt -s t --description "Write descriptive text from a file into RCS"
+complete $admin_opt -x -o t- --description "Write descriptive text into RCS"
+complete $admin_opt -x -s l --description "Unlock a revision"
#
# cvs options for annotate.
#
set -l annotate_opt -c cvs -n 'contains annotate (commandline -poc)'
-complete $annotate_opt -s f -d (N_ "Annotate binary files")
+complete $annotate_opt -s f --description "Annotate binary files"
#
# cvs options for checkout.
#
set -l checkout_opt -c cvs -n 'contains checkout (commandline -poc)'
-complete $checkout_opt -s A -d (N_ "Reset sticky tags/dates/k-opts")
-complete $checkout_opt -s c -d (N_ "Copy module file to stdout")
-complete $checkout_opt -x -s d -d (N_ "Name directory for working files")
-complete $checkout_opt -x -s j -d (N_ "Merge revisions")
-complete $checkout_opt -s N -d (N_ "For -d. Don't shorten paths")
+complete $checkout_opt -s A --description "Reset sticky tags/dates/k-opts"
+complete $checkout_opt -s c --description "Copy module file to stdout"
+complete $checkout_opt -x -s d --description "Name directory for working files"
+complete $checkout_opt -x -s j --description "Merge revisions"
+complete $checkout_opt -s N --description "For -d. Don't shorten paths"
#
# cvs options for commit.
#
set -l commit_opt -c cvs -n 'contains commit (commandline -poc)'
-complete $commit_opt -r -s F -d (N_ "Read log message from file")
-complete $commit_opt -s f -d (N_ "Force new revision")
+complete $commit_opt -r -s F --description "Read log message from file"
+complete $commit_opt -s f --description "Force new revision"
#
# cvs options for diff.
#
set -l diff_opt -c cvs -n 'contains diff (commandline -poc)'
-complete $diff_opt -s a -l text -d (N_ "Treat all files as text")
-complete $diff_opt -s b -l ignore-space-change -d (N_ "Treat all whitespace as one space")
-complete $diff_opt -s B -l ignore-blank-lines -d (N_ "Ignore blank line only changes")
-complete $diff_opt -l binary -d (N_ "Binary mode")
-complete $diff_opt -l brief -d (N_ "Report only whether files differ")
-complete $diff_opt -s c -d (N_ "Use context format")
-complete $diff_opt -r -s C -d (N_ "Set context size")
-complete $diff_opt -l context -d (N_ "Set context format and, optionally, size")
-complete $diff_opt -l changed-group-format -d (N_ "Set line group format")
-complete $diff_opt -s d -l minimal -d (N_ "Try to find a smaller set of changes")
-complete $diff_opt -s e -l ed -d (N_ "Make output a valid ed script")
-complete $diff_opt -s t -l expand-tabs -d (N_ "Expand tabs to spaces")
-complete $diff_opt -s f -l forward-ed -d (N_ "Output that looks like an ed script")
-complete $diff_opt -x -s F -d (N_ "Set regexp for context, unified formats")
-complete $diff_opt -s H -l speed-large-files -d (N_ "Speed handling of large files with small changes")
-complete $diff_opt -x -l horizon-lines -d (N_ "Set horizon lines")
-complete $diff_opt -s i -l ignore-case -d (N_ "Ignore changes in case")
-complete $diff_opt -x -s I -l ignore-matching-lines -d (N_ "Ignore changes matching regexp")
-complete $diff_opt -x -l ifdef -d (N_ "Make ifdef from diff")
-complete $diff_opt -s w -l ignore-all-space -d (N_ "Ignore whitespace")
-complete $diff_opt -s T -l initial-tab -d (N_ "Start lines with a tab")
-complete $diff_opt -x -s L -l label -d (N_ "Use label instead of filename in output")
-complete $diff_opt -l left-column -d (N_ "Print only left column")
-complete $diff_opt -x -l line-format -d (N_ "Use format to produce if-then-else output")
-complete $diff_opt -s n -l rcs -d (N_ "Produce RCS-style diffs")
-complete $diff_opt -s N -l new-file -d (N_ "Treat files absent from one dir as empty")
-complete $diff_opt -l new-group-format -l new-line-format -l old-group-format -l old-line-format -d (N_ "Specifies line formatting")
-complete $diff_opt -s p -l show-c-function -d (N_ "Identify the C function each change is in")
-complete $diff_opt -s s -l report-identical-files -d (N_ "Report identical files")
-complete $diff_opt -s y -l side-by-side -d (N_ "Use side-by-side format")
-complete $diff_opt -l suppress-common-lines -d (N_ "Suppress common lines in side-by-side")
-complete $diff_opt -s u -l unified -d (N_ "Use unified format")
-complete $diff_opt -x -s U -d (N_ "Set context size in unified")
-complete $diff_opt -x -s W -l width -d (N_ "Set column width for side-by-side format")
+complete $diff_opt -s a -l text --description "Treat all files as text"
+complete $diff_opt -s b -l ignore-space-change --description "Treat all whitespace as one space"
+complete $diff_opt -s B -l ignore-blank-lines --description "Ignore blank line only changes"
+complete $diff_opt -l binary --description "Binary mode"
+complete $diff_opt -l brief --description "Report only whether files differ"
+complete $diff_opt -s c --description "Use context format"
+complete $diff_opt -r -s C --description "Set context size"
+complete $diff_opt -l context --description "Set context format and, optionally, size"
+complete $diff_opt -l changed-group-format --description "Set line group format"
+complete $diff_opt -s d -l minimal --description "Try to find a smaller set of changes"
+complete $diff_opt -s e -l ed --description "Make output a valid ed script"
+complete $diff_opt -s t -l expand-tabs --description "Expand tabs to spaces"
+complete $diff_opt -s f -l forward-ed --description "Output that looks like an ed script"
+complete $diff_opt -x -s F --description "Set regexp for context, unified formats"
+complete $diff_opt -s H -l speed-large-files --description "Speed handling of large files with small changes"
+complete $diff_opt -x -l horizon-lines --description "Set horizon lines"
+complete $diff_opt -s i -l ignore-case --description "Ignore changes in case"
+complete $diff_opt -x -s I -l ignore-matching-lines --description "Ignore changes matching regexp"
+complete $diff_opt -x -l ifdef --description "Make ifdef from diff"
+complete $diff_opt -s w -l ignore-all-space --description "Ignore whitespace"
+complete $diff_opt -s T -l initial-tab --description "Start lines with a tab"
+complete $diff_opt -x -s L -l label --description "Use label instead of filename in output"
+complete $diff_opt -l left-column --description "Print only left column"
+complete $diff_opt -x -l line-format --description "Use format to produce if-then-else output"
+complete $diff_opt -s n -l rcs --description "Produce RCS-style diffs"
+complete $diff_opt -s N -l new-file --description "Treat files absent from one dir as empty"
+complete $diff_opt -l new-group-format -l new-line-format -l old-group-format -l old-line-format --description "Specifies line formatting"
+complete $diff_opt -s p -l show-c-function --description "Identify the C function each change is in"
+complete $diff_opt -s s -l report-identical-files --description "Report identical files"
+complete $diff_opt -s y -l side-by-side --description "Use side-by-side format"
+complete $diff_opt -l suppress-common-lines --description "Suppress common lines in side-by-side"
+complete $diff_opt -s u -l unified --description "Use unified format"
+complete $diff_opt -x -s U --description "Set context size in unified"
+complete $diff_opt -x -s W -l width --description "Set column width for side-by-side format"
#
# cvs export options.
#
set -l export_opt -c cvs -n 'contains export (commandline -poc)'
-complete $export_opt -x -s d -d (N_ "Name directory for working files")
-complete $export_opt -s N -d (N_ "For -d. Don't shorten paths")
+complete $export_opt -x -s d --description "Name directory for working files"
+complete $export_opt -s N --description "For -d. Don't shorten paths"
#
# cvs history options.
@@ -188,64 +188,64 @@ complete $export_opt -s N -d (N_ "For -d. Don't shorten paths")
#
set -l history_opt -c cvs -n 'contains history (commandline -poc)'
-complete $history_opt -s c -d (N_ "Report on each commit")
-complete $history_opt -s e -d (N_ "Report on everything")
-complete $history_opt -x -s m -d (N_ "Report on a module")
-complete $history_opt -s o -d (N_ "Report on checked-out modules")
-complete $history_opt -s T -d (N_ "Report on all tags")
-complete $history_opt -x -s x -d (N_ "Specify record type") -a "F\trelease O\tcheckout E\texport T\trtag C\tcollisions G\tmerge U\t'Working file copied from repository' P\t'Working file patched to repository' W\t'Working copy deleted during update' A\t'New file added' M\t'File modified' R\t'File removed.'"
-complete $history_opt -s a -d (N_ "Show history for all users")
-complete $history_opt -s l -d (N_ "Show last modification only")
-complete $history_opt -s w -d (N_ "Show only records for this directory")
+complete $history_opt -s c --description "Report on each commit"
+complete $history_opt -s e --description "Report on everything"
+complete $history_opt -x -s m --description "Report on a module"
+complete $history_opt -s o --description "Report on checked-out modules"
+complete $history_opt -s T --description "Report on all tags"
+complete $history_opt -x -s x --description "Specify record type" -a "F\trelease O\tcheckout E\texport T\trtag C\tcollisions G\tmerge U\t'Working file copied from repository' P\t'Working file patched to repository' W\t'Working copy deleted during update' A\t'New file added' M\t'File modified' R\t'File removed.'"
+complete $history_opt -s a --description "Show history for all users"
+complete $history_opt -s l --description "Show last modification only"
+complete $history_opt -s w --description "Show only records for this directory"
#
# cvs import options.
#
set -l import_opt -c cvs -n 'contains import (commandline -poc)'
-complete $import_opt -x -s b -d (N_ "Multiple vendor branch")
-complete $import_opt -r -s I -d (N_ "Files to ignore during import")
+complete $import_opt -x -s b --description "Multiple vendor branch"
+complete $import_opt -r -s I --description "Files to ignore during import"
#
# cvs log options.
#
set -l log_opt -c cvs -n 'contains log (commandline -poc)'
-complete $log_opt -s b -d (N_ "Print info about revision on default branch")
-complete $log_opt -x -s d -d (N_ "Specify date range for query")
-complete $log_opt -s h -d (N_ "Print only file info")
-complete $log_opt -s N -d (N_ "Do not print tags")
-complete $log_opt -s R -d (N_ "Print only rcs filename")
-complete $log_opt -x -s r -d (N_ "Print only given revisions")
-complete $log_opt -s S -d (N_ "Suppress header if no revisions found")
-complete $log_opt -x -s s -d (N_ "Specify revision states")
-complete $log_opt -s t -d (N_ "Same as -h, plus descriptive text")
-complete $log_opt -x -s w -d (N_ "Specify users for query")
+complete $log_opt -s b --description "Print info about revision on default branch"
+complete $log_opt -x -s d --description "Specify date range for query"
+complete $log_opt -s h --description "Print only file info"
+complete $log_opt -s N --description "Do not print tags"
+complete $log_opt -s R --description "Print only rcs filename"
+complete $log_opt -x -s r --description "Print only given revisions"
+complete $log_opt -s S --description "Suppress header if no revisions found"
+complete $log_opt -x -s s --description "Specify revision states"
+complete $log_opt -s t --description "Same as -h, plus descriptive text"
+complete $log_opt -x -s w --description "Specify users for query"
#
# cvs rdiff options.
#
set -l rdiff_opt -c cvs -n 'contains rdiff (commandline -poc)'
-complete $rdiff_opt -s c -d (N_ "Use context diff format")
-complete $rdiff_opt -s s -d (N_ "Create summary change report")
-complete $rdiff_opt -s t -d (N_ "diff top two revisions")
-complete $rdiff_opt -s u -d (N_ "Use unidiff format")
+complete $rdiff_opt -s c --description "Use context diff format"
+complete $rdiff_opt -s s --description "Create summary change report"
+complete $rdiff_opt -s t --description "diff top two revisions"
+complete $rdiff_opt -s u --description "Use unidiff format"
#
# cvs release options.
#
-complete -c cvs -n 'contains release (commandline -poc)' -s d -d (N_ "Delete working copy if release succeeds")
+complete -c cvs -n 'contains release (commandline -poc)' -s d --description "Delete working copy if release succeeds"
#
# cvs update options.
#
set -l update_opt -c cvs -n 'contains update (commandline -poc)'
-complete $update_opt -s A -d (N_ "Reset sticky tags, dates, and k-opts")
-complete $update_opt -s C -d (N_ "Overwrite modified files with clean copies")
-complete $update_opt -s d -d (N_ "Create any missing directories")
-complete $update_opt -x -s I -d (N_ "Specify files to ignore")
-complete $update_opt -x -s j -d (N_ "Merge revisions")
+complete $update_opt -s A --description "Reset sticky tags, dates, and k-opts"
+complete $update_opt -s C --description "Overwrite modified files with clean copies"
+complete $update_opt -s d --description "Create any missing directories"
+complete $update_opt -x -s I --description "Specify files to ignore"
+complete $update_opt -x -s j --description "Merge revisions"
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index 29cf66f4..39f79b81 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -41,203 +41,203 @@ complete -c darcs -n '__fish_use_subcommand' -xa 'repair\t"'(_ "Repair the corru
#
# These switches are universal
#
-complete -c darcs -s h -l help -d (N_ "Shows brief description of command and its arguments")
-complete -c darcs -l disable -d (N_ "Disable this command")
-complete -c darcs -l repodir -d (N_ "Specify the repository directory in which to run") -x -a '(__fish_complete_directories (commandline -ct))'
-complete -c darcs -s v -l verbose -d (N_ "Verbose mode")
-complete -c darcs -l standard-verbosity -d (N_ "Neither verbose nor quiet output")
+complete -c darcs -s h -l help --description "Shows brief description of command and its arguments"
+complete -c darcs -l disable --description "Disable this command"
+complete -c darcs -l repodir --description "Specify the repository directory in which to run" -x -a '(__fish_complete_directories (commandline -ct))'
+complete -c darcs -s v -l verbose --description "Verbose mode"
+complete -c darcs -l standard-verbosity --description "Neither verbose nor quiet output"
-complete -c darcs -n 'not __fish_use_subcommand' -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" -d (N_ "Darcs repo")
+complete -c darcs -n 'not __fish_use_subcommand' -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" --description "Darcs repo"
#
# Here follows a huge list of subcommand-specific completions. These are incomplete.
#
set -l record_opt -c darcs -n 'contains record (commandline -poc)'
-complete $record_opt -s m -l patch-name -d (N_ "Name of patch") -x
-complete $record_opt -s A -l author -d (N_ "Specify author id") -x
-complete $record_opt -l logfile -d (N_ "Give patch name and comment in file") -r
-complete $record_opt -s a -l all -d (N_ "Answer yes to all patches")
-complete $record_opt -s l -l look-for-adds -d (N_ "In addition to modifications, look for files that are not boring, and thus are potentially pending addition")
-complete $record_opt -l delete-logfile -d (N_ "Delete the logfile when done")
-complete $record_opt -l no-test -d (N_ "Don't run the test script")
-complete $record_opt -l test -d (N_ "Run the test script")
-complete $record_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
-complete $record_opt -l remove-test-directory -d (N_ "Remove the test directory")
-complete $record_opt -l compress -d (N_ "Create compressed patches")
-complete $record_opt -l dont-compress -d (N_ "Don't create compressed patches")
-complete $record_opt -l pipe -d (N_ "Expect to receive input from a pipe")
-complete $record_opt -l interactive -d (N_ "Prompt user interactively")
-complete $record_opt -l ask-deps -d (N_ "Ask for extra dependencies")
-complete $record_opt -l no-ask-deps -d (N_ "Don't ask for extra dependencies")
-complete $record_opt -l edit-long-comment -d (N_ "Edit the long comment by default")
-complete $record_opt -l skip-long-comment -d (N_ "Don't give a long comment")
-complete $record_opt -l prompt-long-comment -d (N_ "Prompt for whether to edit the long comment")
-complete $record_opt -l ignore-times -d (N_ "Don't trust the file modification times")
-complete $record_opt -l dont-look-for-adds -d (N_ "Don't look for any files or directories that could be added, and don't add them automatically")
+complete $record_opt -s m -l patch-name --description "Name of patch" -x
+complete $record_opt -s A -l author --description "Specify author id" -x
+complete $record_opt -l logfile --description "Give patch name and comment in file" -r
+complete $record_opt -s a -l all --description "Answer yes to all patches"
+complete $record_opt -s l -l look-for-adds --description "In addition to modifications, look for files that are not boring, and thus are potentially pending addition"
+complete $record_opt -l delete-logfile --description "Delete the logfile when done"
+complete $record_opt -l no-test --description "Don't run the test script"
+complete $record_opt -l test --description "Run the test script"
+complete $record_opt -l leave-test-directory --description "Don't remove the test directory"
+complete $record_opt -l remove-test-directory --description "Remove the test directory"
+complete $record_opt -l compress --description "Create compressed patches"
+complete $record_opt -l dont-compress --description "Don't create compressed patches"
+complete $record_opt -l pipe --description "Expect to receive input from a pipe"
+complete $record_opt -l interactive --description "Prompt user interactively"
+complete $record_opt -l ask-deps --description "Ask for extra dependencies"
+complete $record_opt -l no-ask-deps --description "Don't ask for extra dependencies"
+complete $record_opt -l edit-long-comment --description "Edit the long comment by default"
+complete $record_opt -l skip-long-comment --description "Don't give a long comment"
+complete $record_opt -l prompt-long-comment --description "Prompt for whether to edit the long comment"
+complete $record_opt -l ignore-times --description "Don't trust the file modification times"
+complete $record_opt -l dont-look-for-adds --description "Don't look for any files or directories that could be added, and don't add them automatically"
set -l pull_opt -c darcs -n 'contains pull (commandline -poc)'
-complete $pull_opt -s p -l patches -d (N_ "Select patches matching REGEXP") -x
-complete $pull_opt -s t -l tags -d (N_ "Select tags matching REGEXP") -x
-complete $pull_opt -s a -l all -d (N_ "Answer yes to all patches")
-complete $pull_opt -s s -l summary -d (N_ "Summarize changes")
-complete $pull_opt -s q -l quiet -d (N_ "Suppress informational output")
-complete $pull_opt -l matches -d (N_ "Select patches matching PATTERN") -x
-complete $pull_opt -l external-merge -d (N_ "Use external tool to merge conflicts") -x
-complete $pull_opt -l interactive -d (N_ "Prompt user interactively")
-complete $pull_opt -l compress -d (N_ "Create compressed patches")
-complete $pull_opt -l dont-compress -d (N_ "Don't create compressed patches")
-complete $pull_opt -l test -d (N_ "Run the test script")
-complete $pull_opt -l no-test -d (N_ "Don't run the test script")
-complete $pull_opt -l dry-run -d (N_ "Don't actually take the action")
-complete $pull_opt -l no-summary -d (N_ "Don't summarize changes")
-complete $pull_opt -l ignore-times -d (N_ "Don't trust the file modification times")
-complete $pull_opt -l no-deps -d (N_ "Don't automatically fulfill dependencies")
-complete $pull_opt -l set-default -d (N_ "Set default repository [DEFAULT]")
-complete $pull_opt -l no-set-default -d (N_ "Don't set default repository")
-complete $pull_opt -l set-scripts-executable -d (N_ "Make scripts executable")
-complete $pull_opt -l dont-set-scripts-executable -d (N_ "Don't make scripts executable")
+complete $pull_opt -s p -l patches --description "Select patches matching REGEXP" -x
+complete $pull_opt -s t -l tags --description "Select tags matching REGEXP" -x
+complete $pull_opt -s a -l all --description "Answer yes to all patches"
+complete $pull_opt -s s -l summary --description "Summarize changes"
+complete $pull_opt -s q -l quiet --description "Suppress informational output"
+complete $pull_opt -l matches --description "Select patches matching PATTERN" -x
+complete $pull_opt -l external-merge --description "Use external tool to merge conflicts" -x
+complete $pull_opt -l interactive --description "Prompt user interactively"
+complete $pull_opt -l compress --description "Create compressed patches"
+complete $pull_opt -l dont-compress --description "Don't create compressed patches"
+complete $pull_opt -l test --description "Run the test script"
+complete $pull_opt -l no-test --description "Don't run the test script"
+complete $pull_opt -l dry-run --description "Don't actually take the action"
+complete $pull_opt -l no-summary --description "Don't summarize changes"
+complete $pull_opt -l ignore-times --description "Don't trust the file modification times"
+complete $pull_opt -l no-deps --description "Don't automatically fulfill dependencies"
+complete $pull_opt -l set-default --description "Set default repository [DEFAULT]"
+complete $pull_opt -l no-set-default --description "Don't set default repository"
+complete $pull_opt -l set-scripts-executable --description "Make scripts executable"
+complete $pull_opt -l dont-set-scripts-executable --description "Don't make scripts executable"
set -l apply_opt -c darcs -n 'contains apply (commandline -poc)'
-complete $apply_opt -s a -l all -d (N_ "Answer yes to all patches")
-complete $apply_opt -l verify -d (N_ "Verify that the patch was signed by a key in PUBRING") -r
-complete $apply_opt -l verify-ssl -d (N_ "Verify using openSSL with authorized keys from specified file") -r
-complete $apply_opt -l sendmail-command -d (N_ "Specify sendmail command") -r
-complete $apply_opt -l reply -d (N_ "Reply to email-based patch using FROM address") -x
-complete $apply_opt -l cc -d (N_ "Mail results to additional EMAIL(s). Requires --reply") -x
-complete $apply_opt -l external-merge -d (N_ "Use external tool to merge conflicts") -r
-complete $apply_opt -l no-verify -d (N_ "Don't verify patch signature")
-complete $apply_opt -l ignore-times -d (N_ "Don't trust the file modification times")
-complete $apply_opt -l compress -d (N_ "Create compressed patches")
-complete $apply_opt -l dont-compress -d (N_ "Don't create compressed patches")
-complete $apply_opt -l interactive -d (N_ "Prompt user interactively")
-complete $apply_opt -l mark-conflicts -d (N_ "Mark conflicts")
-complete $apply_opt -l allow-conflicts -d (N_ "Allow conflicts, but don't mark them")
-complete $apply_opt -l dont-allow-conflicts -d (N_ "Fail on patches that create conflicts [DEFAULT]")
-complete $apply_opt -l no-test -d (N_ "Don't run the test script")
-complete $apply_opt -l test -d (N_ "Run the test script")
-complete $apply_opt -l happy-forwarding -d (N_ "Forward unsigned messages without extra header")
-complete $apply_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
-complete $apply_opt -l remove-test-directory -d (N_ "Remove the test directory")
-complete $apply_opt -l set-scripts-executable -d (N_ "Make scripts executable")
-complete $apply_opt -l dont-set-scripts-executable -d (N_ "Don't make scripts executable")
+complete $apply_opt -s a -l all --description "Answer yes to all patches"
+complete $apply_opt -l verify --description "Verify that the patch was signed by a key in PUBRING" -r
+complete $apply_opt -l verify-ssl --description "Verify using openSSL with authorized keys from specified file" -r
+complete $apply_opt -l sendmail-command --description "Specify sendmail command" -r
+complete $apply_opt -l reply --description "Reply to email-based patch using FROM address" -x
+complete $apply_opt -l cc --description "Mail results to additional EMAIL(s). Requires --reply" -x
+complete $apply_opt -l external-merge --description "Use external tool to merge conflicts" -r
+complete $apply_opt -l no-verify --description "Don't verify patch signature"
+complete $apply_opt -l ignore-times --description "Don't trust the file modification times"
+complete $apply_opt -l compress --description "Create compressed patches"
+complete $apply_opt -l dont-compress --description "Don't create compressed patches"
+complete $apply_opt -l interactive --description "Prompt user interactively"
+complete $apply_opt -l mark-conflicts --description "Mark conflicts"
+complete $apply_opt -l allow-conflicts --description "Allow conflicts, but don't mark them"
+complete $apply_opt -l dont-allow-conflicts --description "Fail on patches that create conflicts [DEFAULT]"
+complete $apply_opt -l no-test --description "Don't run the test script"
+complete $apply_opt -l test --description "Run the test script"
+complete $apply_opt -l happy-forwarding --description "Forward unsigned messages without extra header"
+complete $apply_opt -l leave-test-directory --description "Don't remove the test directory"
+complete $apply_opt -l remove-test-directory --description "Remove the test directory"
+complete $apply_opt -l set-scripts-executable --description "Make scripts executable"
+complete $apply_opt -l dont-set-scripts-executable --description "Don't make scripts executable"
set -l check_opt -c darcs -n 'contains check (commandline -poc)'
-complete $check_opt -s v -l verbose -d (N_ "Verbose mode")
-complete $check_opt -s q -l quiet -d (N_ "Suppress informational output")
-complete $check_opt -l complete -d (N_ "Check the entire repository")
-complete $check_opt -l partial -d (N_ "Check patches since latest checkpoint")
-complete $check_opt -l no-test -d (N_ "Don't run the test script")
-complete $check_opt -l test -d (N_ "Run the test script")
-complete $check_opt -l leave-test-directory -d (N_ "Don't remove the test directory")
-complete $check_opt -l remove-test-directory -d (N_ "Remove the test directory")
+complete $check_opt -s v -l verbose --description "Verbose mode"
+complete $check_opt -s q -l quiet --description "Suppress informational output"
+complete $check_opt -l complete --description "Check the entire repository"
+complete $check_opt -l partial --description "Check patches since latest checkpoint"
+complete $check_opt -l no-test --description "Don't run the test script"
+complete $check_opt -l test --description "Run the test script"
+complete $check_opt -l leave-test-directory --description "Don't remove the test directory"
+complete $check_opt -l remove-test-directory --description "Remove the test directory"
set -l mv_opt -c darcs -n 'contains mv (commandline -poc)'
-complete $mv_opt -s v -l verbose -d (N_ "Verbose mode")
-complete $mv_opt -l case-ok -d (N_ "Don't refuse to add files differing only in case")
+complete $mv_opt -s v -l verbose --description "Verbose mode"
+complete $mv_opt -l case-ok --description "Don't refuse to add files differing only in case"
set -l send_opt -c darcs -n 'contains send (commandline -poc)'
-complete $send_opt -s v -l verbose -d (N_ "Verbose mode")
-complete $send_opt -s q -l quiet -d (N_ "Suppress informational output")
-complete $send_opt -xs p -l patches -d (N_ "Select patches matching REGEXP")
-complete $send_opt -xs t -l tags -d (N_ "Select tags matching REGEXP")
-complete $send_opt -s a -l all -d (N_ "Answer yes to all patches")
-complete $send_opt -xs A -l author -d (N_ "Specify author id")
-complete $send_opt -rs o -l output -d (N_ "Specify output filename")
-complete $send_opt -s u -l unified -d (N_ "Output patch in a darcs-specific format similar to diff -u")
-complete $send_opt -s s -l summary -d (N_ "Summarize changes")
-complete $send_opt -xl matches -d (N_ "Select patches matching PATTERN")
-complete $send_opt -l interactive -d (N_ "Prompt user interactively")
-complete $send_opt -xl from -d (N_ "Specify email address")
-complete $send_opt -xl to -d (N_ "Specify destination email")
-complete $send_opt -xl cc -d (N_ "Mail results to additional EMAIL(s). Requires --reply")
-complete $send_opt -l sign -d (N_ "Sign the patch with your gpg key")
-complete $send_opt -xl sign-as -d (N_ "Sign the patch with a given keyid")
-complete $send_opt -rl sign-ssl -d (N_ "Sign the patch using openssl with a given private key")
-complete $send_opt -l dont-sign -d (N_ "Do not sign the patch")
-complete $send_opt -l dry-run -d (N_ "Don't actually take the action")
-complete $send_opt -l no-summary -d (N_ "Don't summarize changes")
-complete $send_opt -rl context -d (N_ "Send to context stored in FILENAME")
-complete $send_opt -l edit-description -d (N_ "Edit the patch bundle description")
-complete $send_opt -l set-default -d (N_ "Set default repository [DEFAULT]")
-complete $send_opt -l no-set-default -d (N_ "Don't set default repository")
-complete $send_opt -rl sendmail-command -d (N_ "Specify sendmail command")
+complete $send_opt -s v -l verbose --description "Verbose mode"
+complete $send_opt -s q -l quiet --description "Suppress informational output"
+complete $send_opt -xs p -l patches --description "Select patches matching REGEXP"
+complete $send_opt -xs t -l tags --description "Select tags matching REGEXP"
+complete $send_opt -s a -l all --description "Answer yes to all patches"
+complete $send_opt -xs A -l author --description "Specify author id"
+complete $send_opt -rs o -l output --description "Specify output filename"
+complete $send_opt -s u -l unified --description "Output patch in a darcs-specific format similar to diff -u"
+complete $send_opt -s s -l summary --description "Summarize changes"
+complete $send_opt -xl matches --description "Select patches matching PATTERN"
+complete $send_opt -l interactive --description "Prompt user interactively"
+complete $send_opt -xl from --description "Specify email address"
+complete $send_opt -xl to --description "Specify destination email"
+complete $send_opt -xl cc --description "Mail results to additional EMAIL(s). Requires --reply"
+complete $send_opt -l sign --description "Sign the patch with your gpg key"
+complete $send_opt -xl sign-as --description "Sign the patch with a given keyid"
+complete $send_opt -rl sign-ssl --description "Sign the patch using openssl with a given private key"
+complete $send_opt -l dont-sign --description "Do not sign the patch"
+complete $send_opt -l dry-run --description "Don't actually take the action"
+complete $send_opt -l no-summary --description "Don't summarize changes"
+complete $send_opt -rl context --description "Send to context stored in FILENAME"
+complete $send_opt -l edit-description --description "Edit the patch bundle description"
+complete $send_opt -l set-default --description "Set default repository [DEFAULT]"
+complete $send_opt -l no-set-default --description "Don't set default repository"
+complete $send_opt -rl sendmail-command --description "Specify sendmail command"
set -l init_opt -c darcs -n 'contains initialize (commandline -poc)'
-complete $init_opt -l plain-pristine-tree -d (N_ "Use a plain pristine tree [DEFAULT]")
-complete $init_opt -l no-pristine-tree -d (N_ "Use no pristine tree")
+complete $init_opt -l plain-pristine-tree --description "Use a plain pristine tree [DEFAULT]"
+complete $init_opt -l no-pristine-tree --description "Use no pristine tree"
set -l annotate_opt -c darcs -n 'contains annotate (commandline -poc)'
-complete $annotate_opt -s s -l summary -d (N_ "Summarize changes")
-complete $annotate_opt -l no-summary -d (N_ "Don't summarize changes")
-complete $annotate_opt -s u -l unified -d (N_ "Output patch in a darcs-specific format similar to diff -u")
-complete $annotate_opt -l human-readable -d (N_ "Give human readable output")
-complete $annotate_opt -l xml-output -d (N_ "Generate XML formatted output")
-complete $annotate_opt -l match -x -d (N_ "Select patch matching PATTERN")
-complete $annotate_opt -s p -l patch -x -d (N_ "Select patch matching REGEXP")
-complete $annotate_opt -s t -l tag -x -d (N_ "Select tag matching REGEXP")
-complete $annotate_opt -l creator-hash -x -d (N_ "Specify hash of creator patch (see docs)")
+complete $annotate_opt -s s -l summary --description "Summarize changes"
+complete $annotate_opt -l no-summary --description "Don't summarize changes"
+complete $annotate_opt -s u -l unified --description "Output patch in a darcs-specific format similar to diff -u"
+complete $annotate_opt -l human-readable --description "Give human readable output"
+complete $annotate_opt -l xml-output --description "Generate XML formatted output"
+complete $annotate_opt -l match -x --description "Select patch matching PATTERN"
+complete $annotate_opt -s p -l patch -x --description "Select patch matching REGEXP"
+complete $annotate_opt -s t -l tag -x --description "Select tag matching REGEXP"
+complete $annotate_opt -l creator-hash -x --description "Specify hash of creator patch (see docs)"
set -l changes_opt -c darcs -n 'contains changes (commandline -poc)'
-complete $changes_opt -l to-match -x -d (N_ "Select changes up to a patch matching PATTERN")
-complete $changes_opt -l to-patch -x -d (N_ "Select changes up to a patch matching REGEXP")
-complete $changes_opt -l to-tag -x -d (N_ "Select changes up to a tag matching REGEXP")
-complete $changes_opt -l from-match -x -d (N_ "Select changes starting with a patch matching PATTERN")
-complete $changes_opt -l from-patch -x -d (N_ "Select changes starting with a patch matching REGEXP")
-complete $changes_opt -l from-tag -x -d (N_ "Select changes starting with a tag matching REGEXP")
-complete $changes_opt -l last -x -d (N_ "Select the last NUMBER patches")
-complete $changes_opt -l matches -x -d (N_ "Select patches matching PATTERN")
-complete $changes_opt -s p -l patches -x -d (N_ "Select patches matching REGEXP")
-complete $changes_opt -s t -l tags -x -d (N_ "Select tags matching REGEXP")
-complete $changes_opt -l context -d (N_ "Give output suitable for get --context")
-complete $changes_opt -l xml-output -d (N_ "Generate XML formatted output")
-complete $changes_opt -l human-readable -d (N_ "Give human-readable output")
-complete $changes_opt -s s -l summary -d (N_ "Summarize changes")
-complete $changes_opt -l no-summary -d (N_ "Don't summarize changes")
-complete $changes_opt -s q -l quiet -d (N_ "Suppress informational output")
-complete $changes_opt -l reverse -d (N_ "Show changes in reverse order")
-complete $changes_opt -l repo -x -d (N_ "Specify the repository URL")
+complete $changes_opt -l to-match -x --description "Select changes up to a patch matching PATTERN"
+complete $changes_opt -l to-patch -x --description "Select changes up to a patch matching REGEXP"
+complete $changes_opt -l to-tag -x --description "Select changes up to a tag matching REGEXP"
+complete $changes_opt -l from-match -x --description "Select changes starting with a patch matching PATTERN"
+complete $changes_opt -l from-patch -x --description "Select changes starting with a patch matching REGEXP"
+complete $changes_opt -l from-tag -x --description "Select changes starting with a tag matching REGEXP"
+complete $changes_opt -l last -x --description "Select the last NUMBER patches"
+complete $changes_opt -l matches -x --description "Select patches matching PATTERN"
+complete $changes_opt -s p -l patches -x --description "Select patches matching REGEXP"
+complete $changes_opt -s t -l tags -x --description "Select tags matching REGEXP"
+complete $changes_opt -l context --description "Give output suitable for get --context"
+complete $changes_opt -l xml-output --description "Generate XML formatted output"
+complete $changes_opt -l human-readable --description "Give human-readable output"
+complete $changes_opt -s s -l summary --description "Summarize changes"
+complete $changes_opt -l no-summary --description "Don't summarize changes"
+complete $changes_opt -s q -l quiet --description "Suppress informational output"
+complete $changes_opt -l reverse --description "Show changes in reverse order"
+complete $changes_opt -l repo -x --description "Specify the repository URL"
set -l add_opt -c darcs -n 'contains add (commandline -poc)'
-complete $add_opt -l boring -d (N_ "Don't skip boring files")
-complete $add_opt -l case-ok -d (N_ "Don't refuse to add files differing only in case")
-complete $add_opt -s r -l recursive -d (N_ "Add contents of subdirectories")
-complete $add_opt -l not-recursive -d (N_ "Don't add contents of subdirectories")
-complete $add_opt -l date-trick -d (N_ "Add files with date appended to avoid conflict. [EXPERIMENTAL]")
-complete $add_opt -l no-date-trick -d (N_ "Don't use experimental date appending trick. [DEFAULT]")
-complete $add_opt -s q -l quiet -d (N_ "Suppress informational output")
-complete $add_opt -l dry-run -d (N_ "Don't actually take the action")
-complete $add_opt -s q -l quiet -d (N_ "Suppress informational output")
+complete $add_opt -l boring --description "Don't skip boring files"
+complete $add_opt -l case-ok --description "Don't refuse to add files differing only in case"
+complete $add_opt -s r -l recursive --description "Add contents of subdirectories"
+complete $add_opt -l not-recursive --description "Don't add contents of subdirectories"
+complete $add_opt -l date-trick --description "Add files with date appended to avoid conflict. [EXPERIMENTAL]"
+complete $add_opt -l no-date-trick --description "Don't use experimental date appending trick. [DEFAULT]"
+complete $add_opt -s q -l quiet --description "Suppress informational output"
+complete $add_opt -l dry-run --description "Don't actually take the action"
+complete $add_opt -s q -l quiet --description "Suppress informational output"
set -l optimize_opt -c darcs -n 'contains optimize (commandline -poc)'
-complete $optimize_opt -l checkpoint -d (N_ "Create a checkpoint file")
-complete $optimize_opt -l compress -d (N_ "Create compressed patches")
-complete $optimize_opt -l dont-compress -d (N_ "Don't create compressed patches")
-complete $optimize_opt -l uncompress -d (N_ "Uncompress patches")
-complete $optimize_opt -s t -l tag -r -d (N_ "Name of version to checkpoint")
-complete $optimize_opt -l modernize-patches -d (N_ "Rewrite all patches in current darcs format")
-complete $optimize_opt -l reorder-patches -d (N_ "Reorder the patches in the repository")
-complete $optimize_opt -l sibling -r -d (N_ "Specify a sibling directory")
-complete $optimize_opt -l relink -d (N_ "Relink random internal data to a sibling")
-complete $optimize_opt -l relink-pristine -d (N_ "Relink pristine tree (not recommended)")
-complete $optimize_opt -l posthook -r -d (N_ "Specify command to run after this darcs command.")
-complete $optimize_opt -l no-posthook -d (N_ "Do not run posthook command.B")
-complete $optimize_opt -l prompt-posthook -d (N_ "Prompt before running posthook. [DEFAULT]")
-complete $optimize_opt -l run-posthook -d (N_ "Run posthook command without prompting.")
+complete $optimize_opt -l checkpoint --description "Create a checkpoint file"
+complete $optimize_opt -l compress --description "Create compressed patches"
+complete $optimize_opt -l dont-compress --description "Don't create compressed patches"
+complete $optimize_opt -l uncompress --description "Uncompress patches"
+complete $optimize_opt -s t -l tag -r --description "Name of version to checkpoint"
+complete $optimize_opt -l modernize-patches --description "Rewrite all patches in current darcs format"
+complete $optimize_opt -l reorder-patches --description "Reorder the patches in the repository"
+complete $optimize_opt -l sibling -r --description "Specify a sibling directory"
+complete $optimize_opt -l relink --description "Relink random internal data to a sibling"
+complete $optimize_opt -l relink-pristine --description "Relink pristine tree (not recommended)"
+complete $optimize_opt -l posthook -r --description "Specify command to run after this darcs command."
+complete $optimize_opt -l no-posthook --description "Do not run posthook command."
+complete $optimize_opt -l prompt-posthook --description "Prompt before running posthook. [DEFAULT]"
+complete $optimize_opt -l run-posthook --description "Run posthook command without prompting."
set -l setpref_opt -c darcs -n 'contains setpref (commandline -poc)'
-complete $setpref_opt -l posthook -r -d (N_ "Specify command to run after this darcs command.")
-complete $setpref_opt -l no-posthook -d (N_ "Do not run posthook command.")
-complete $setpref_opt -l prompt-posthook -d (N_ "Prompt before running posthook. [DEFAULT]")
-complete $setpref_opt -l run-posthook -d (N_ "Run posthook command without prompting.")
+complete $setpref_opt -l posthook -r --description "Specify command to run after this darcs command."
+complete $setpref_opt -l no-posthook --description "Do not run posthook command."
+complete $setpref_opt -l prompt-posthook --description "Prompt before running posthook. [DEFAULT]"
+complete $setpref_opt -l run-posthook --description "Run posthook command without prompting."
diff --git a/share/completions/date.fish b/share/completions/date.fish
index 6be0b612..1c93f235 100644
--- a/share/completions/date.fish
+++ b/share/completions/date.fish
@@ -1,11 +1,11 @@
-complete -c date -s d -l date -d (N_ "Display date described by string") -x
-complete -c date -s f -l file -d (N_ "Display date for each line in file") -r
-complete -c date -s I -l iso-8601 -d (N_ "Output in ISO 8601 format") -x -a "date hours minutes seconds"
-complete -c date -s s -l set -d (N_ "Set time") -x
-complete -c date -s R -l rfc-2822 -d (N_ "Output RFC-2822 compliant date string")
-complete -c date -s r -l reference -d (N_ "Display the last modification time of file") -r
-complete -c date -s u -l utc -d (N_ "Print or set Coordinated Universal Time")
-complete -c date -l universal -d (N_ "Print or set Coordinated Universal Time")
-complete -c date -s h -l help -d (N_ "Display help and exit")
-complete -c date -s v -l version -d (N_ "Display version and exit")
+complete -c date -s d -l date --description "Display date described by string" -x
+complete -c date -s f -l file --description "Display date for each line in file" -r
+complete -c date -s I -l iso-8601 --description "Output in ISO 8601 format" -x -a "date hours minutes seconds"
+complete -c date -s s -l set --description "Set time" -x
+complete -c date -s R -l rfc-2822 --description "Output RFC-2822 compliant date string"
+complete -c date -s r -l reference --description "Display the last modification time of file" -r
+complete -c date -s u -l utc --description "Print or set Coordinated Universal Time"
+complete -c date -l universal --description "Print or set Coordinated Universal Time"
+complete -c date -s h -l help --description "Display help and exit"
+complete -c date -s v -l version --description "Display version and exit"
diff --git a/share/completions/dcop.fish b/share/completions/dcop.fish
index 8e59c09a..333c53db 100644
--- a/share/completions/dcop.fish
+++ b/share/completions/dcop.fish
@@ -31,13 +31,13 @@ function __fish_complete_dcop -d "Completions for kde dcop"
end
-complete -c dcop -l help -s h -f -d (N_ "Show help about options")
-complete -c dcop -l user -x -a '(awk -F: "{print \$1}" /etc/passwd)' -d (N_ "Connect to the given user's DCOP server")
-complete -c dcop -l all-users -f -d (N_ "Send the same DCOP call to all users with a running DCOP server")
-complete -c dcop -l list-sessions -f -d (N_ "List all active KDE session for a user or all users")
-complete -c dcop -l session -x -a '(dcop --list-sessions --all-users | grep DCOP)' -d (N_ "Send to the given KDE session")
-complete -c dcop -l no-user-time -f -d (N_ "Don't update the user activity timestamp in the called application")
-complete -c dcop -l pipe -f -d (N_ "Call DCOP for each line read from stdin")
+complete -c dcop -l help -s h -f --description "Show help about options"
+complete -c dcop -l user -x -a '(awk -F: "{print \$1}" /etc/passwd)' --description "Connect to the given user's DCOP server"
+complete -c dcop -l all-users -f --description "Send the same DCOP call to all users with a running DCOP server"
+complete -c dcop -l list-sessions -f --description "List all active KDE session for a user or all users"
+complete -c dcop -l session -x -a '(dcop --list-sessions --all-users | grep DCOP)' --description "Send to the given KDE session"
+complete -c dcop -l no-user-time -f --description "Don't update the user activity timestamp in the called application"
+complete -c dcop -l pipe -f --description "Call DCOP for each line read from stdin"
complete -c dcop -x -a "(__fish_complete_dcop)"
diff --git a/share/completions/df.fish b/share/completions/df.fish
index f19e3b44..22ec4652 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -9,30 +9,30 @@
set -l is_gnu
df --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
-__fish_gnu_complete -c df -s h -l human-readable -d (N_ "Human readable sizes") $is_gnu
-__fish_gnu_complete -c df -s i -l inodes -d (N_ "List inode information") $is_gnu
-__fish_gnu_complete -c df -s k -d (N_ "Use 1kB block size") $is_gnu
-__fish_gnu_complete -c df -s l -l local -d (N_ "List only local filesystems") $is_gnu
-__fish_gnu_complete -c df -s P -l portability -d (N_ "Use Posix format") $is_gnu
-__fish_gnu_complete -c df -s t -l type -r -d (N_ "Show filesystems of specified type") $is_gnu -x -a "(__fish_print_filesystems)"
+__fish_gnu_complete -c df -s h -l human-readable --description "Human readable sizes" $is_gnu
+__fish_gnu_complete -c df -s i -l inodes --description "List inode information" $is_gnu
+__fish_gnu_complete -c df -s k --description "Use 1kB block size" $is_gnu
+__fish_gnu_complete -c df -s l -l local --description "List only local filesystems" $is_gnu
+__fish_gnu_complete -c df -s P -l portability --description "Use Posix format" $is_gnu
+__fish_gnu_complete -c df -s t -l type -r --description "Show filesystems of specified type" $is_gnu -x -a "(__fish_print_filesystems)"
if test -n "$is_gnu"
- complete -c df -s a -l all -d (N_ "Include empty filesystems")
- complete -c df -s B -l block-size -r -d (N_ "Block size")
- complete -c df -s H -l si -d (N_ "Human readable sizes, powers of 1000")
- complete -c df -l no-sync -d (N_ "Do not sync before getting usage info")
- complete -c df -l sync -d (N_ "Sync before getting usage info")
- complete -c df -s T -l print-type -d (N_ "Print filesystem type")
- complete -c df -s x -l exclude-type -d (N_ "Excluded filesystem type") -r -x -a "(__fish_print_filesystems)"
- complete -c df -l help -d (N_ "Display help and exit")
- complete -c df -l version -d (N_ "Display version and exit")
+ complete -c df -s a -l all --description "Include empty filesystems"
+ complete -c df -s B -l block-size -r --description "Block size"
+ complete -c df -s H -l si --description "Human readable sizes, powers of 1000"
+ complete -c df -l no-sync --description "Do not sync before getting usage info"
+ complete -c df -l sync --description "Sync before getting usage info"
+ complete -c df -s T -l print-type --description "Print filesystem type"
+ complete -c df -s x -l exclude-type --description "Excluded filesystem type" -r -x -a "(__fish_print_filesystems)"
+ complete -c df -l help --description "Display help and exit"
+ complete -c df -l version --description "Display version and exit"
else
- complete -c df -s a -d (N_ "Show all filesystems")
- complete -c df -s g -d (N_ "Show sizes in gigabytes")
- complete -c df -s m -d (N_ "Show sizes in megabytes")
- complete -c df -s n -d (N_ "Print out the previously obtained statistics from the file systems")
+ complete -c df -s a --description "Show all filesystems"
+ complete -c df -s g --description "Show sizes in gigabytes"
+ complete -c df -s m --description "Show sizes in megabytes"
+ complete -c df -s n --description "Print out the previously obtained statistics from the file systems"
end
diff --git a/share/completions/diff.fish b/share/completions/diff.fish
index 3d3e5fa8..88813b7b 100644
--- a/share/completions/diff.fish
+++ b/share/completions/diff.fish
@@ -1,26 +1,26 @@
# Completions for diff
-complete -c diff -s i -l ignore-case -d (N_ "Ignore case differences")
-complete -c diff -l ignore-file-name-case -d (N_ "Ignore case when comparing file names")
-complete -c diff -l no-ignore-file-name-case -d (N_ "Consider case when comparing file names")
-complete -c diff -s E -l ignore-tab-expansion -d (N_ "Ignore changes due to tab expansion")
-complete -c diff -s b -l ignore-space-change -d (N_ "Ignore changes in the amount of white space")
-complete -c diff -s w -l ignore-all-space -d (N_ "Ignore all white space")
-complete -c diff -s B -l ignore-blank-lines -d (N_ "Ignore changes whose lines are all blank")
-complete -c diff -s I -l ignore-matching-lines -x -d (N_ "Ignore changes whose lines match the REGEX")
-complete -c diff -s a -l text -d (N_ "Treat all files as text")
-complete -c diff -s r -l recursive -d (N_ "Recursively compare subdirectories")
-complete -c diff -s N -l new-file -d (N_ "Treat absent files as empty")
-complete -c diff -s C -l context -x -d (N_ "Output NUM lines of copied context")
-complete -c diff -s c -d (N_ "Output 3 lines of copied context")
-complete -c diff -s U -l unified -x -d (N_ "Output NUM lines of unified context")
-complete -c diff -s u -d (N_ "Output 3 lines of unified context")
-complete -c diff -s q -l brief -d (N_ "Output only whether the files differ")
-complete -c diff -l normal -d (N_ "Output a normal diff")
-complete -c diff -s y -l side-by-side -d (N_ "Output in two columns")
-complete -c diff -s W -l width -x -d (N_ "Output at most NUM print columns")
-complete -c diff -s d -l minimal -d (N_ "Try to find a smaller set of changes")
-complete -c diff -l from-file -r -d (N_ "Compare FILE1 to all operands")
-complete -c diff -l to-file -r -d (N_ "Compare FILE2 to all operands")
-complete -c diff -s l -l paginate -d (N_ "Pass the output through 'pr'")
-complete -c diff -s v -l version -d (N_ "Display version and exit")
-complete -c diff -l help -d (N_ "Display help and exit")
+complete -c diff -s i -l ignore-case --description "Ignore case differences"
+complete -c diff -l ignore-file-name-case --description "Ignore case when comparing file names"
+complete -c diff -l no-ignore-file-name-case --description "Consider case when comparing file names"
+complete -c diff -s E -l ignore-tab-expansion --description "Ignore changes due to tab expansion"
+complete -c diff -s b -l ignore-space-change --description "Ignore changes in the amount of white space"
+complete -c diff -s w -l ignore-all-space --description "Ignore all white space"
+complete -c diff -s B -l ignore-blank-lines --description "Ignore changes whose lines are all blank"
+complete -c diff -s I -l ignore-matching-lines -x --description "Ignore changes whose lines match the REGEX"
+complete -c diff -s a -l text --description "Treat all files as text"
+complete -c diff -s r -l recursive --description "Recursively compare subdirectories"
+complete -c diff -s N -l new-file --description "Treat absent files as empty"
+complete -c diff -s C -l context -x --description "Output NUM lines of copied context"
+complete -c diff -s c --description "Output 3 lines of copied context"
+complete -c diff -s U -l unified -x --description "Output NUM lines of unified context"
+complete -c diff -s u --description "Output 3 lines of unified context"
+complete -c diff -s q -l brief --description "Output only whether the files differ"
+complete -c diff -l normal --description "Output a normal diff"
+complete -c diff -s y -l side-by-side --description "Output in two columns"
+complete -c diff -s W -l width -x --description "Output at most NUM print columns"
+complete -c diff -s d -l minimal --description "Try to find a smaller set of changes"
+complete -c diff -l from-file -r --description "Compare FILE1 to all operands"
+complete -c diff -l to-file -r --description "Compare FILE2 to all operands"
+complete -c diff -s l -l paginate --description "Pass the output through 'pr'"
+complete -c diff -s v -l version --description "Display version and exit"
+complete -c diff -l help --description "Display help and exit"
diff --git a/share/completions/du.fish b/share/completions/du.fish
index de00ee03..cfb60f79 100644
--- a/share/completions/du.fish
+++ b/share/completions/du.fish
@@ -1,20 +1,20 @@
-complete -c du -s a -l all -d (N_ "Write size for all files")
-complete -c du -l apparent-size -d (N_ "Print file size, not disk usage")
-complete -c du -s B -l block-size -d (N_ "Block size")
-complete -c du -s b -l bytes -d (N_ "Use 1B block size")
-complete -c du -s c -l total -d (N_ "Produce grand total")
-complete -c du -s D -l dereference-args -d (N_ "Dereference file symlinks")
-complete -c du -s h -l human-readable -d (N_ "Human readable sizes")
-complete -c du -s H -l si -d (N_ "Human readable sizes, powers of 1000")
-complete -c du -s k -d (N_ "Use 1kB block size")
-complete -c du -s l -l count-links -d (N_ "Count hard links multiple times")
-complete -c du -s L -l dereference -d (N_ "Dereference all symlinks")
-complete -c du -s S -l separate-dirs -d (N_ "Do not include subdirectory size")
-complete -c du -s s -l summarize -d (N_ "Display only a total for each argument")
-complete -c du -s x -l one-file-system -d (N_ "Skip other filesystems")
-complete -c du -s X -l exclude-from -r -d (N_ "Exclude files thet match pattern in file")
-complete -c du -l exclude -r -d (N_ "Exclude files that match pattern")
-complete -c du -l max-depth -r -d (N_ "Recursion limit")
-complete -c du -l help -d (N_ "Display help and exit")
-complete -c du -l version -d (N_ "Display version and exit")
+complete -c du -s a -l all --description "Write size for all files"
+complete -c du -l apparent-size --description "Print file size, not disk usage"
+complete -c du -s B -l block-size --description "Block size"
+complete -c du -s b -l bytes --description "Use 1B block size"
+complete -c du -s c -l total --description "Produce grand total"
+complete -c du -s D -l dereference-args --description "Dereference file symlinks"
+complete -c du -s h -l human-readable --description "Human readable sizes"
+complete -c du -s H -l si --description "Human readable sizes, powers of 1000"
+complete -c du -s k --description "Use 1kB block size"
+complete -c du -s l -l count-links --description "Count hard links multiple times"
+complete -c du -s L -l dereference --description "Dereference all symlinks"
+complete -c du -s S -l separate-dirs --description "Do not include subdirectory size"
+complete -c du -s s -l summarize --description "Display only a total for each argument"
+complete -c du -s x -l one-file-system --description "Skip other filesystems"
+complete -c du -s X -l exclude-from -r --description "Exclude files thet match pattern in file"
+complete -c du -l exclude -r --description "Exclude files that match pattern"
+complete -c du -l max-depth -r --description "Recursion limit"
+complete -c du -l help --description "Display help and exit"
+complete -c du -l version --description "Display version and exit"
diff --git a/share/completions/echo.fish b/share/completions/echo.fish
index e859e46a..06108a7a 100644
--- a/share/completions/echo.fish
+++ b/share/completions/echo.fish
@@ -1,5 +1,5 @@
-complete -c echo -s n -d (N_ "No newline")
-complete -c echo -s e -d (N_ "Use backslash escaped characters")
-complete -c echo -s E -d (N_ "Do not use backslash escaped characters")
-complete -c echo -l help -d (N_ "Display help and exit")
-complete -c echo -l version -d (N_ "Display version and exit")
+complete -c echo -s n --description "No newline"
+complete -c echo -s e --description "Use backslash escaped characters"
+complete -c echo -s E --description "Do not use backslash escaped characters"
+complete -c echo -l help --description "Display help and exit"
+complete -c echo -l version --description "Display version and exit"
diff --git a/share/completions/emacs.fish b/share/completions/emacs.fish
index 83c4a674..a6001323 100644
--- a/share/completions/emacs.fish
+++ b/share/completions/emacs.fish
@@ -1,10 +1,10 @@
#
# These completions are uncomplete
#
-complete -c emacs -s q -d (N_ "Do not load init files")
-complete -c emacs -s u -d (N_ "Load users init file") -xa "(__fish_complete_users)"
-complete -c emacs -s t -d (N_ "Use file as terminal") -r
-complete -c emacs -s f -d (N_ "Execute Lisp function") -x
-complete -c emacs -s l -d (N_ "Load Lisp code from file") -r
-complete -c emacs -o nw -d (N_ "Do not use X interface")
-complete -uc emacs -s d -o display -d (N_ "Create window on the specified display") -x
+complete -c emacs -s q --description "Do not load init files"
+complete -c emacs -s u --description "Load users init file" -xa "(__fish_complete_users)"
+complete -c emacs -s t --description "Use file as terminal" -r
+complete -c emacs -s f --description "Execute Lisp function" -x
+complete -c emacs -s l --description "Load Lisp code from file" -r
+complete -c emacs -o nw --description "Do not use X interface"
+complete -uc emacs -s d -o display --description "Create window on the specified display" -x
diff --git a/share/completions/emerge.fish b/share/completions/emerge.fish
index 2fa1300a..a70e32cd 100644
--- a/share/completions/emerge.fish
+++ b/share/completions/emerge.fish
@@ -2,21 +2,21 @@
# Author: Tassilo Horn <tassilo@member.fsf.org>
-function __fish_emerge_print_installed_pkgs -d (N_ 'Prints completions for installed packages on the system from /var/db/pkg')
+function __fish_emerge_print_installed_pkgs --description 'Prints completions for installed packages on the system from /var/db/pkg'
if test -d /var/db/pkg
find /var/db/pkg/ -type d | cut -d'/' -f5-6 | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//' | sed -e '/^ *$/d'
return
end
end
-function __fish_emerge_print_all_pkgs -d (N_ 'Prints completions for all available packages on the system from /usr/portage')
+function __fish_emerge_print_all_pkgs --description 'Prints completions for all available packages on the system from /usr/portage'
if test -d /usr/portage
find /usr/portage/ -maxdepth 2 -type d | cut -d'/' -f4-5 | sed 's/^\(distfiles\|profiles\|eclass\).*$//' | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//' | sed -e '/^ *$/d'
return
end
end
-function __fish_emerge_use_installed_package -d (N_ 'Tests if emerge command should have an installed package as potential completion')
+function __fish_emerge_use_installed_package --description 'Tests if emerge command should have an installed package as potential completion'
for i in (commandline -opc)
if contains -- $i -u --update -C --unmerge -P --prune --config
return 0
diff --git a/share/completions/env.fish b/share/completions/env.fish
index 828ae894..ae8586d7 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -1,10 +1,10 @@
-complete -c env -a "(set -n)=" -x -d (N_ "Redefine variable")
+complete -c env -a "(set -n)=" -x --description "Redefine variable"
-complete -c env -a "(__fish_complete_subcommand -- -u --unset)" -d (N_ "Command")
+complete -c env -a "(__fish_complete_subcommand -- -u --unset)" --description "Command"
-complete -c env -s i -l ignore-environment -d (N_ "Start with an empty environment")
-complete -c env -s u -l unset -d (N_ "Remove variable from the environment") -x -a "(set -n)"
-complete -c env -l help -d (N_ "Display help and exit")
-complete -c env -l version -d (N_ "Display version and exit")
+complete -c env -s i -l ignore-environment --description "Start with an empty environment"
+complete -c env -s u -l unset --description "Remove variable from the environment" -x -a "(set -n)"
+complete -c env -l help --description "Display help and exit"
+complete -c env -l version --description "Display version and exit"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index 31d987ee..01d9cc15 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -2,21 +2,21 @@
# Author: Tassilo Horn <tassilo@member.fsf.org>
-function __fish_equery_print_installed_pkgs -d (N_ 'Prints completions for installed packages on the system from /var/db/pkg')
+function __fish_equery_print_installed_pkgs --description 'Prints completions for installed packages on the system from /var/db/pkg'
if test -d /var/db/pkg
find /var/db/pkg/ -type d | cut -d'/' -f5-6 | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//'
return
end
end
-function __fish_equery_print_all_pkgs -d (N_ 'Prints completions for all available packages on the system from /usr/portage')
+function __fish_equery_print_all_pkgs --description 'Prints completions for all available packages on the system from /usr/portage'
if test -d /usr/portage
find /usr/portage/ -maxdepth 2 -type d | cut -d'/' -f4-5 | sed 's/^\(distfiles\|profiles\|eclass\).*$//' | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//'
return
end
end
-function __fish_equery_print_all_categories -d (N_ 'Prints completions for all available categories on the system from /usr/portage')
+function __fish_equery_print_all_categories --description 'Prints completions for all available categories on the system from /usr/portage'
if test -d /usr/portage
find /usr/portage/ -maxdepth 1 -type d | cut -d'/' -f4 | sed 's/^\(distfiles\|profiles\|eclass\).*$//' | sort | uniq | sed 's/-[0-9]\{1,\}\..*$//'
return
diff --git a/share/completions/find.fish b/share/completions/find.fish
index 5ffa5fc0..473109d8 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -4,106 +4,106 @@
# Switches for how to handle symlinks
-complete -c find -s P -d (N_ "Never follow symlinks")
-complete -c find -s L -o follow -d (N_ "Follow symlinks")
-complete -c find -s H -d (N_ "Do not follow symbolic links, except while processing the command line arguments")
+complete -c find -s P --description "Never follow symlinks"
+complete -c find -s L -o follow --description "Follow symlinks"
+complete -c find -s H --description "Do not follow symbolic links, except while processing the command line arguments"
# General options
-complete -c find -o daystart -d (N_ "Measure from the beginning of today rather than from 24 hours ago")
-complete -c find -s d -o depth -d (N_ "Process subdirectories before the directory itself")
-complete -c find -o help -l help -d (N_ "Display help and exit")
-complete -c find -o ignore_readdir_race -d (N_ "Do not print error messages for files that are deleted while running find")
-complete -c find -o maxdepth -d (N_ "Maximum recursion depth") -a "1 2 3 4 5 6 7 8 9"
-complete -c find -o mindepth -d (N_ "Do not apply any tests or actions at levels less than specified level") -a "1 2 3 4 5 6 7 8 9"
-complete -c find -o mount -o xdev -d (N_ "Don't descend directories on other filesystems")
-complete -c find -o noignore_readdir_race -d (N_ "Print error messages for files that are deleted while running find")
-complete -c find -o noleaf -d (N_ "Do not optimize by assuming that directories contain 2 fewer subdirectories than their hard link count")
-complete -c find -o regextype -d (N_ "Specify regular expression type") -a "emacs posix-awk posix-basic posiz-egrep posix-extended"
-complete -c find -o version -l version -d (N_ "Display version and exit")
-complete -c find -o warn -d (N_ "Turn warnings on")
-complete -c find -o nowarn -d (N_ "Turn warnings off")
+complete -c find -o daystart --description "Measure from the beginning of today rather than from 24 hours ago"
+complete -c find -s d -o depth --description "Process subdirectories before the directory itself"
+complete -c find -o help -l help --description "Display help and exit"
+complete -c find -o ignore_readdir_race --description "Do not print error messages for files that are deleted while running find"
+complete -c find -o maxdepth --description "Maximum recursion depth" -a "1 2 3 4 5 6 7 8 9"
+complete -c find -o mindepth --description "Do not apply any tests or actions at levels less than specified level" -a "1 2 3 4 5 6 7 8 9"
+complete -c find -o mount -o xdev --description "Don't descend directories on other filesystems"
+complete -c find -o noignore_readdir_race --description "Print error messages for files that are deleted while running find"
+complete -c find -o noleaf --description "Do not optimize by assuming that directories contain 2 fewer subdirectories than their hard link count"
+complete -c find -o regextype --description "Specify regular expression type" -a "emacs posix-awk posix-basic posiz-egrep posix-extended"
+complete -c find -o version -l version --description "Display version and exit"
+complete -c find -o warn --description "Turn warnings on"
+complete -c find -o nowarn --description "Turn warnings off"
# Tests
-complete -c find -o amin -d (N_ "File last accessed specified number of minutes ago") -r
-complete -c find -o anewer -d (N_ "File last accessed more recently than file was modified") -r
-complete -c find -o atime -d (N_ "File last accessed specified number of days ago") -r
+complete -c find -o amin --description "File last accessed specified number of minutes ago" -r
+complete -c find -o anewer --description "File last accessed more recently than file was modified" -r
+complete -c find -o atime --description "File last accessed specified number of days ago" -r
-complete -c find -o cmin -d (N_ "File status last changed specified number of minutes ago") -r
-complete -c find -o cnewer -d (N_ "File status last changed more recently than file was modified") -r
-complete -c find -o ctime -d (N_ "File status last changed specified number of days ago") -r
+complete -c find -o cmin --description "File status last changed specified number of minutes ago" -r
+complete -c find -o cnewer --description "File status last changed more recently than file was modified" -r
+complete -c find -o ctime --description "File status last changed specified number of days ago" -r
-complete -c find -o empty -d (N_ "File is empty and is either a regular file or a directory")
-complete -c find -o false -d (N_ "Always false")
-complete -c find -o fstype -d (N_ "File is on filesystem of specified type") -a "(__fish_print_filesystems)" -r
-complete -c find -o gid -d (N_ "Numeric group id of file") -r
-complete -c find -o group -d (N_ "Group name of file") -a "(__fish_complete_groups)"
+complete -c find -o empty --description "File is empty and is either a regular file or a directory"
+complete -c find -o false --description "Always false"
+complete -c find -o fstype --description "File is on filesystem of specified type" -a "(__fish_print_filesystems)" -r
+complete -c find -o gid --description "Numeric group id of file" -r
+complete -c find -o group --description "Group name of file" -a "(__fish_complete_groups)"
-complete -c find -o ilname -d (N_ "File is symlink matching specified case insensitive pattern") -r
-complete -c find -o iname -d (N_ "File name matches case insensitive pattern") -r
-complete -c find -o inum -d (N_ "File has specified inode number") -r
-complete -c find -o ipath -o iwholename -d (N_ "File path matches case insensitive pattern") -r
-complete -c find -o iregex -d (N_ "File name matches case insensetive regex") -r
+complete -c find -o ilname --description "File is symlink matching specified case insensitive pattern" -r
+complete -c find -o iname --description "File name matches case insensitive pattern" -r
+complete -c find -o inum --description "File has specified inode number" -r
+complete -c find -o ipath -o iwholename --description "File path matches case insensitive pattern" -r
+complete -c find -o iregex --description "File name matches case insensetive regex" -r
-complete -c find -o links -d (N_ "File has specified number of links") -r -a "1 2 3 4 5 6 7 8 9"
-complete -c find -o lname -d (N_ "File is symlink matching specified pattern") -r
+complete -c find -o links --description "File has specified number of links" -r -a "1 2 3 4 5 6 7 8 9"
+complete -c find -o lname --description "File is symlink matching specified pattern" -r
-complete -c find -o mmin -d (N_ "File last modified specified number of minutes ago") -r
-complete -c find -o newer -d (N_ "File last modified more recently than file was modified") -r
-complete -c find -o mtime -d (N_ "File last modified specified number of days ago") -r
+complete -c find -o mmin --description "File last modified specified number of minutes ago" -r
+complete -c find -o newer --description "File last modified more recently than file was modified" -r
+complete -c find -o mtime --description "File last modified specified number of days ago" -r
-complete -c find -o name -d (N_ "File name matches pattern") -r
+complete -c find -o name --description "File name matches pattern" -r
-complete -c find -o nouser -d (N_ "No user corresponds to file's numeric user ID")
-complete -c find -o nogroup -d (N_ "No group corresponds to file's numeric group ID")
+complete -c find -o nouser --description "No user corresponds to file's numeric user ID"
+complete -c find -o nogroup --description "No group corresponds to file's numeric group ID"
-complete -c find -o path -o wholename -d (N_ "File path matches pattern") -r
+complete -c find -o path -o wholename --description "File path matches pattern" -r
-complete -c find -o perm -d (N_ "Files has specified permissions set") -r
+complete -c find -o perm --description "Files has specified permissions set" -r
-complete -c find -o iregex -d (N_ "File name matches regex") -r
+complete -c find -o iregex --description "File name matches regex" -r
-complete -c find -o samefile -d (N_ "File refers to the same inode as specified file") -r
-complete -c find -o size -d (N_ "File uses specified units of space") -r
-complete -c find -o true -d (N_ "Always true")
+complete -c find -o samefile --description "File refers to the same inode as specified file" -r
+complete -c find -o size --description "File uses specified units of space" -r
+complete -c find -o true --description "Always true"
set -l type_comp 'b\t"Block device" c\t"Character device" d\t"Directory" p\t"Named pipe" f\t"File" l\t"Symbolic link" s\t"Socket"'
-complete -c find -o type -d (N_ "File is of specified type") -x -a $type_comp
+complete -c find -o type --description "File is of specified type" -x -a $type_comp
-complete -c find -o uid -d (N_ "File's owner has specified numeric user ID") -r
-complete -c find -o used -d (N_ "File was last accessed specified number of days after its status was last changed") -r
-complete -c find -o user -d (N_ "File's owner") -a "(__fish_complete_users)" -r
-complete -c find -o xtype -d (N_ "Check type of file - in case of symlink, check the file that is not checked by -type") -x -a $type_comp
-complete -c find -o context -d (N_ "File's security context matches specified pattern") -r
+complete -c find -o uid --description "File's owner has specified numeric user ID" -r
+complete -c find -o used --description "File was last accessed specified number of days after its status was last changed" -r
+complete -c find -o user --description "File's owner" -a "(__fish_complete_users)" -r
+complete -c find -o xtype --description "Check type of file - in case of symlink, check the file that is not checked by -type" -x -a $type_comp
+complete -c find -o context --description "File's security context matches specified pattern" -r
# Actions
-complete -c find -o delete -d (N_ "Delete selected files")
-complete -c find -o exec -d (N_ "Execute specified command for each located file") -r
-complete -c find -o execdir -d (N_ "Execute specified command for each located file, in the files directory") -r
-complete -c find -o fls -d (N_ "List file in ls -dils format, write to specified file") -r
-complete -c find -o fprint -d (N_ "Print full file names into specified file") -r
-complete -c find -o fprint0 -d (N_ "Print null separated full file names into specified file") -r
-complete -c find -o fprintf -d (N_ "Print formated data into specified file") -r
-complete -c find -o ok -d (N_ "Execute specified command for each located file after asking user") -r
-complete -c find -o print -d (N_ "Print full file names")
-complete -c find -o okdir -d (N_ "Execute specified command for each located file, in the files directory, after asking user") -r
-complete -c find -o print0 -d (N_ "Print null separated full file names")
-complete -c find -o printf -d (N_ "Print formated data") -r
-complete -c find -o prune -d (N_ "Do not recurse unless -depth is specified")
-complete -c find -o quit -d (N_ "Exit at once")
-complete -c find -o ls -d (N_ "List file in ls -dils format") -r
+complete -c find -o delete --description "Delete selected files"
+complete -c find -o exec --description "Execute specified command for each located file" -r
+complete -c find -o execdir --description "Execute specified command for each located file, in the files directory" -r
+complete -c find -o fls --description "List file in ls -dils format, write to specified file" -r
+complete -c find -o fprint --description "Print full file names into specified file" -r
+complete -c find -o fprint0 --description "Print null separated full file names into specified file" -r
+complete -c find -o fprintf --description "Print formated data into specified file" -r
+complete -c find -o ok --description "Execute specified command for each located file after asking user" -r
+complete -c find -o print --description "Print full file names"
+complete -c find -o okdir --description "Execute specified command for each located file, in the files directory, after asking user" -r
+complete -c find -o print0 --description "Print null separated full file names"
+complete -c find -o printf --description "Print formated data" -r
+complete -c find -o prune --description "Do not recurse unless -depth is specified"
+complete -c find -o quit --description "Exit at once"
+complete -c find -o ls --description "List file in ls -dils format" -r
# Grouping
-complete -c find -o not -d (N_ "Negate result of action")
-complete -c find -o and -s a -d (N_ "Result is only true if both previous and next action are true")
-complete -c find -o or -s o -d (N_ "Result is true if either previous or next action are true")
+complete -c find -o not --description "Negate result of action"
+complete -c find -o and -s a --description "Result is only true if both previous and next action are true"
+complete -c find -o or -s o --description "Result is true if either previous or next action are true"
diff --git a/share/completions/fish.fish b/share/completions/fish.fish
index 5b34ac38..91b7f704 100644
--- a/share/completions/fish.fish
+++ b/share/completions/fish.fish
@@ -1,7 +1,7 @@
-complete -c fish -s c -l "command" -d (N_ "Run fish with this command")
-complete -c fish -s h -l help -d (N_ "Display help and exit")
-complete -c fish -s v -l version -d (N_ "Display version and exit")
-complete -c fish -s n -l no-execute -d (N_ "Only parse input, do not execute")
-complete -c fish -s i -l interactive -d (N_ "Run in interactive mode")
-complete -c fish -s l -l login -d (N_ "Run in login mode")
-complete -c fish -s p -l profile -d (N_ "Output profiling information to specified file") -f
+complete -c fish -s c -l "command" --description "Run fish with this command"
+complete -c fish -s h -l help --description "Display help and exit"
+complete -c fish -s v -l version --description "Display version and exit"
+complete -c fish -s n -l no-execute --description "Only parse input, do not execute"
+complete -c fish -s i -l interactive --description "Run in interactive mode"
+complete -c fish -s l -l login --description "Run in login mode"
+complete -c fish -s p -l profile --description "Output profiling information to specified file" -f
diff --git a/share/completions/function.fish b/share/completions/function.fish
index 6e297648..aa2d6643 100644
--- a/share/completions/function.fish
+++ b/share/completions/function.fish
@@ -1,8 +1,8 @@
-complete -c function -s d -l description -d (N_ "Set function description") -x
-complete -c function -xa "(functions -n)" -d (N_ "Function")
-complete -c function -xa "(builtin -n)" -d (N_ "Builtin")
-complete -c function -s j -l on-job-exit -d (N_ "Make the function a job exit event handler") -x
-complete -c function -s p -l on-process-exit -d (N_ "Make the function a process exit event handler") -x
-complete -c function -s s -l on-signal -d (N_ "Make the function a signal event handler") -x
-complete -c function -s v -l on-variable -d (N_ "Make the function a variable update event handler") -x
-complete -c function -s b -l key-binding -d (N_ "Allow dash (-) in function name")
+complete -c function -s d -l description --description "Set function description" -x
+complete -c function -xa "(functions -n)" --description "Function"
+complete -c function -xa "(builtin -n)" --description "Builtin"
+complete -c function -s j -l on-job-exit --description "Make the function a job exit event handler" -x
+complete -c function -s p -l on-process-exit --description "Make the function a process exit event handler" -x
+complete -c function -s s -l on-signal --description "Make the function a signal event handler" -x
+complete -c function -s v -l on-variable --description "Make the function a variable update event handler" -x
+complete -c function -s b -l key-binding --description "Allow dash (-) in function name"
diff --git a/share/completions/functions.fish b/share/completions/functions.fish
index 738ba747..9315963e 100644
--- a/share/completions/functions.fish
+++ b/share/completions/functions.fish
@@ -1,7 +1,7 @@
-complete -c functions -s e -l erase -d (N_ "Erase function") -x -a "(functions -n)"
-complete -c functions -xa "(functions -na)" -d (N_ "Function")
-complete -c functions -s a -l all -d (N_ "Show hidden functions")
-complete -c functions -s h -l help -d (N_ "Display help and exit")
-complete -c functions -s d -l description -d (N_ "Set function description") -x
-complete -c functions -s q -l query -d (N_ "Test if function is defined")
-complete -c functions -s n -l names -d (N_ "List the names of the functions, but not their definition")
+complete -c functions -s e -l erase --description "Erase function" -x -a "(functions -n)"
+complete -c functions -xa "(functions -na)" --description "Function"
+complete -c functions -s a -l all --description "Show hidden functions"
+complete -c functions -s h -l help --description "Display help and exit"
+complete -c functions -s d -l description --description "Set function description" -x
+complete -c functions -s q -l query --description "Test if function is defined"
+complete -c functions -s n -l names --description "List the names of the functions, but not their definition"
diff --git a/share/completions/fusermount.fish b/share/completions/fusermount.fish
index 45ae8922..df46a828 100644
--- a/share/completions/fusermount.fish
+++ b/share/completions/fusermount.fish
@@ -3,17 +3,17 @@
#
# Find mount points, borrowed from umount.fish
#
-complete -c fusermount -d (N_ "Mount point") -x -a '
+complete -c fusermount --description "Mount point" -x -a '
(
cat /etc/mtab | sgrep "^sshfs" | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/"
cat /etc/mtab | sgrep "^fuseiso" | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/"
)
'
-complete -c fusermount -s h -d (N_ "Display help and exit")
-complete -c fusermount -s v -d (N_ "Display version and exit")
-complete -c fusermount -s o -x -d (N_ "Mount options")
-complete -c fusermount -s u -d (N_ "Unmount")
-complete -c fusermount -s q -d (N_ "Quiet")
-complete -c fusermount -s z -d (N_ "Lazy unmount")
+complete -c fusermount -s h --description "Display help and exit"
+complete -c fusermount -s v --description "Display version and exit"
+complete -c fusermount -s o -x --description "Mount options"
+complete -c fusermount -s u --description "Unmount"
+complete -c fusermount -s q --description "Quiet"
+complete -c fusermount -s z --description "Lazy unmount"
diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index 8f8a55dc..ea3aeae9 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -2,7 +2,7 @@
# The gcc completion list is incomplete. There are just so many of them...
#
-complete -c gcc -s x -d (N_ "Language") -x -a '
+complete -c gcc -s x --description "Language" -x -a '
c
c-header
cpp-output
@@ -20,16 +20,16 @@ complete -c gcc -s x -d (N_ "Language") -x -a '
treelang
none
'
-complete -c gcc -o pass-exit-codes -d (N_ "Pass program exit codes")
-complete -c gcc -s c -d (N_ "Stop after assembler")
-complete -c gcc -s S -d (N_ "Stop after compile")
-complete -c gcc -s E -d (N_ "Stop after preprocessor")
-complete -c gcc -s o -r -d (N_ "Output file")
-complete -c gcc -s v -d (N_ "Print commands to stderr")
-complete -c gcc -o \#\#\# -d (N_ "Print quoted commands to stderr, do not run")
-complete -c gcc -o pipe -d (N_ "Use pipes")
-complete -c gcc -o ansi -d (N_ "Use ansi mode")
-complete -c gcc -o std -d (N_ "Standard mode") -x -a '
+complete -c gcc -o pass-exit-codes --description "Pass program exit codes"
+complete -c gcc -s c --description "Stop after assembler"
+complete -c gcc -s S --description "Stop after compile"
+complete -c gcc -s E --description "Stop after preprocessor"
+complete -c gcc -s o -r --description "Output file"
+complete -c gcc -s v --description "Print commands to stderr"
+complete -c gcc -o \#\#\# --description "Print quoted commands to stderr, do not run"
+complete -c gcc -o pipe --description "Use pipes"
+complete -c gcc -o ansi --description "Use ansi mode"
+complete -c gcc -o std --description "Standard mode" -x -a '
c89\t"ISO C90"
iso9899:1990\t"ISO C90"
iso9899:199409\t"ISO C90 as modified in amendment 1"
@@ -43,54 +43,58 @@ complete -c gcc -o std -d (N_ "Standard mode") -x -a '
c++98\t"ISO C++98"
gnu++98\t"ISO C++98 plus GNU extentions"
'
-complete -c gcc -o aux-info -r -d (N_ "Write prototypes to file")
-complete -c gcc -o fno-asm -d (N_ "Do not recognize asm, inline or typeof keywords")
-complete -c gcc -o fno-builtin -d (N_ "Do not use builtin functions")
-complete -c gcc -o fhosted -d (N_ "Assert hosted environment")
-complete -c gcc -o ffreestanding -d (N_ "Assert freestanding environment")
-complete -c gcc -o fms-extensions -d (N_ "Use Microsoft extensions")
-complete -c gcc -o trigraphs -d (N_ "Use ANSI trigraphs")
-complete -c gcc -o no-integrated-cpp -d (N_ "Do not use integrated preprocessor")
-complete -c gcc -o funsigned-char -d (N_ "char is unsigned")
-complete -c gcc -o fsigned-char -d (N_ "char is signed")
-complete -c gcc -o funsigned-bitfields -d (N_ "bitfield is unsigned")
-complete -c gcc -o fsigned-bitfields -d (N_ "bitfield is signed")
-complete -c gcc -o fno-unsigned-bitfields -d (N_ "All bitfields are signed")
-complete -c gcc -o fno-signed-bitfields -d (N_ "All bitfields are unsigned")
-complete -c gcc -o fwritable-strings -d (N_ "String constants are not const")
-complete -c gcc -o fabi-version -d (N_ "C++ ABI version") -r -x -a '1 0'
-complete -c gcc -o fno-access-control -d (N_ "Turn off access checking")
-complete -c gcc -o fcheck-new -d (N_ "Check pointer returned by new")
-complete -c gcc -o fconserve-space -d (N_ "Put globals in the common segment")
-complete -c gcc -o fno-const-strings -d (N_ "String constants are not const")
-complete -c gcc -o fdollars-in-identifiers -d (N_ "Accept \$ in identifiers")
-complete -c gcc -o fno-dollars-in-identifiers -d (N_ "Reject \$ in identifiers")
-complete -c gcc -o fno-elide-constructors -d (N_ "Do not omit unneeded temporarys")
-complete -c gcc -o fno-enforce-eh-specs -d (N_ "Allow exception violations")
-complete -c gcc -o ffor-scope -d (N_ "Do not extend for-loop scope")
-complete -c gcc -o fno-for-scope -d (N_ "Extend for-loop scope")
-complete -c gcc -o fno-gnu-keywords -d (N_ "Do not recognize typeof as keyword")
-complete -c gcc -o fno-implicit-templates -d (N_ "Do not emit code for implicit templates")
-complete -c gcc -o fno-implicit-inline-templates -d (N_ "Do not emit code for implicit inline templates")
-complete -c gcc -o fno-implement-inlines -d (N_ "Do not emit out-of-line code for inline functions")
-complete -c gcc -o fms-extensions -d (N_ "Disable warnings about MFC")
-complete -c gcc -o fno-nonansi-builtins -d (N_ "Disable some built-in functions")
-complete -c gcc -o fno-operator-names -d (N_ "Disable operator keywords")
-complete -c gcc -o fno-optional-diags -d (N_ "Disable optional diagnostics")
-complete -c gcc -o fpermissive -d (N_ "Downgrade some errors to warnings")
-complete -c gcc -o frepo -d (N_ "Enable automatic template instantiation at link time")
-complete -c gcc -o fno-rtti -d (N_ "Disable generation of C++ runtime type information")
-#complete -c gcc -o fstats -d (N_ "Emit front-end usage statistics")
+complete -c gcc -o aux-info -r --description "Write prototypes to file"
+complete -c gcc -o fno-asm --description "Do not recognize asm, inline or typeof keywords"
+complete -c gcc -o fno-builtin --description "Do not use builtin functions"
+complete -c gcc -o fhosted --description "Assert hosted environment"
+complete -c gcc -o ffreestanding --description "Assert freestanding environment"
+complete -c gcc -o fms-extensions --description "Use Microsoft extensions"
+complete -c gcc -o trigraphs --description "Use ANSI trigraphs"
+complete -c gcc -o no-integrated-cpp --description "Do not use integrated preprocessor"
+complete -c gcc -o funsigned-char --description "char is unsigned"
+complete -c gcc -o fsigned-char --description "char is signed"
+complete -c gcc -o funsigned-bitfields --description "bitfield is unsigned"
+complete -c gcc -o fsigned-bitfields --description "bitfield is signed"
+complete -c gcc -o fno-unsigned-bitfields --description "All bitfields are signed"
+complete -c gcc -o fno-signed-bitfields --description "All bitfields are unsigned"
+complete -c gcc -o fwritable-strings --description "String constants are not const"
+complete -c gcc -o fabi-version --description "C++ ABI version" -r -x -a '1 0'
+complete -c gcc -o fno-access-control --description "Turn off access checking"
+complete -c gcc -o fcheck-new --description "Check pointer returned by new"
+complete -c gcc -o fconserve-space --description "Put globals in the common segment"
+complete -c gcc -o fno-const-strings --description "String constants are not const"
+complete -c gcc -o fdollars-in-identifiers --description "Accept \$ in identifiers"
+complete -c gcc -o fno-dollars-in-identifiers --description "Reject \$ in identifiers"
+complete -c gcc -o fno-elide-constructors --description "Do not omit unneeded temporarys"
+complete -c gcc -o fno-enforce-eh-specs --description "Allow exception violations"
+complete -c gcc -o ffor-scope --description "Do not extend for-loop scope"
+complete -c gcc -o fno-for-scope --description "Extend for-loop scope"
+complete -c gcc -o fno-gnu-keywords --description "Do not recognize typeof as keyword"
+complete -c gcc -o fno-implicit-templates --description "Do not emit code for implicit templates"
+complete -c gcc -o fno-implicit-inline-templates --description "Do not emit code for implicit inline templates"
+complete -c gcc -o fno-implement-inlines --description "Do not emit out-of-line code for inline functions"
+complete -c gcc -o fms-extensions --description "Disable warnings about MFC"
+complete -c gcc -o fno-nonansi-builtins --description "Disable some built-in functions"
+complete -c gcc -o fno-operator-names --description "Disable operator keywords"
+complete -c gcc -o fno-optional-diags --description "Disable optional diagnostics"
+complete -c gcc -o fpermissive --description "Downgrade some errors to warnings"
+complete -c gcc -o frepo --description "Enable automatic template instantiation at link time"
+complete -c gcc -o fno-rtti --description "Disable generation of C++ runtime type information"
+#complete -c gcc -o fstats --description "Emit front-end usage statistics"
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;
- complete -c gcc -o ftemplate-depth-1 -d (N_ "Set maximum template depth")
+ complete -c gcc -o ftemplate-depth-1 --description "Set maximum template depth"
end;
-complete -c gcc -o fno-threadsafe-statistics -d (N_ "Do not emit code for thread-safe initialization of local statics")
-complete -c gcc -o fuse-cxa-atexit -d (N_ "Use __cxa_atexit for destructors")
-complete -c gcc -o fvisibility-inlines-hidden -d (N_ "Hides inline methods from export table")
-complete -c gcc -o fno-weak -d (N_ "Do not use weak symbol support")
+complete -c gcc -o fno-threadsafe-statistics --description "Do not emit code for thread-safe initialization of local statics"
+complete -c gcc -o fuse-cxa-atexit --description "Use __cxa_atexit for destructors"
+complete -c gcc -o fvisibility-inlines-hidden --description "Hides inline methods from export table"
+complete -c gcc -o fno-weak --description "Do not use weak symbol support"
+
+complete -c gcc -l help --description "Display help and exit"
+complete -c gcc -l version --description "Display version and exit"
+
# gcc completion listing is incomplete.
-#complete -c gcc -o -d (N_ "")
+#complete -c gcc -o --description ""
diff --git a/share/completions/gem.fish b/share/completions/gem.fish
index 68a2f43e..d7b4221a 100644
--- a/share/completions/gem.fish
+++ b/share/completions/gem.fish
@@ -32,54 +32,54 @@ complete -c gem -n '__fish_use_subcommand' -xa 'update\t"'(_ "Update the named g
# common opts
set -l common_opt -c gem -n 'not __fish_use_subcommand' #'__subcommand_given'
-complete $common_opt -l source -d (N_ "Use URL as the remote source for gems") -x
-complete $common_opt -s p -l http-proxy -d (N_ "Use the given HTTP proxy for remote operations") -x
-complete $common_opt -l no-http-proxy -d (N_ "Use no HTTP proxy for remote operations")
-complete $common_opt -s h -l help -d (N_ "Get help on this command")
-complete $common_opt -s v -l verbose -d (N_ "Set the verbose level of output")
-complete $common_opt -l config-file -d (N_ "Use this config file instead of default") -x
-complete $common_opt -l backtrace -d (N_ "Show stack backtrace on errors")
-complete $common_opt -l debug -d (N_ "Turn on Ruby debugging")
+complete $common_opt -l source --description "Use URL as the remote source for gems" -x
+complete $common_opt -s p -l http-proxy --description "Use the given HTTP proxy for remote operations" -x
+complete $common_opt -l no-http-proxy --description "Use no HTTP proxy for remote operations"
+complete $common_opt -s h -l help --description "Get help on this command"
+complete $common_opt -s v -l verbose --description "Set the verbose level of output"
+complete $common_opt -l config-file --description "Use this config file instead of default" -x
+complete $common_opt -l backtrace --description "Show stack backtrace on errors"
+complete $common_opt -l debug --description "Turn on Ruby debugging"
##
# cert
set -l cert_opt -c gem -n 'contains cert (commandline -poc)'
-complete $cert_opt -s a -l add -d (N_ "Add a trusted certificate") -x
-complete $cert_opt -s l -l list -d (N_ "List trusted certificates")
-complete $cert_opt -s r -l remove -d (N_ "Remove trusted certificates containing STRING") -x
-complete $cert_opt -s b -l build -d (N_ "Build private key and self-signed certificate for EMAIL_ADDR") -x
-complete $cert_opt -s C -l certificate -d (N_ "Certificate for --sign command") -x
-complete $cert_opt -s K -l private-key -d (N_ "Private key for --sign command") -x
-complete $cert_opt -s s -l sign -d (N_ "Sign a certificate with my key and certificate") -x
+complete $cert_opt -s a -l add --description "Add a trusted certificate" -x
+complete $cert_opt -s l -l list --description "List trusted certificates"
+complete $cert_opt -s r -l remove --description "Remove trusted certificates containing STRING" -x
+complete $cert_opt -s b -l build --description "Build private key and self-signed certificate for EMAIL_ADDR" -x
+complete $cert_opt -s C -l certificate --description "Certificate for --sign command" -x
+complete $cert_opt -s K -l private-key --description "Private key for --sign command" -x
+complete $cert_opt -s s -l sign --description "Sign a certificate with my key and certificate" -x
##
# check
set -l check_opt -c gem -n 'contains check (commandline -poc)'
-complete $check_opt -s v -l verify -d (N_ "Verify gem file against its internal checksum") -x
-complete $check_opt -s a -l alien -d (N_ "Report 'unmanaged' or rogue files in the gem repository")
-complete $check_opt -s t -l test -d (N_ "Run unit tests for gem")
-complete $check_opt -s V -l version -d (N_ "Specify version for which to run unit tests")
+complete $check_opt -s v -l verify --description "Verify gem file against its internal checksum" -x
+complete $check_opt -s a -l alien --description "Report 'unmanaged' or rogue files in the gem repository"
+complete $check_opt -s t -l test --description "Run unit tests for gem"
+complete $check_opt -s V -l version --description "Specify version for which to run unit tests"
##
# cleanup
set -l cleanup_opt -c gem -n 'contains cleanup (commandline -poc)'
-complete $cleanup_opt -s d -l dryrun -d (N_ "Don't really cleanup")
+complete $cleanup_opt -s d -l dryrun --description "Don't really cleanup"
##
# contents
set -l contents_opt -c gem -n 'contains contents (commandline -poc)'
-complete $contents_opt -s l -l list -d (N_ "List the files inside a Gem")
-complete $contents_opt -s V -l version -d (N_ "Specify version for gem to view")
-complete $contents_opt -s s -l spec-dir -d (N_ "Search for gems under specific paths") -x
-complete $contents_opt -s v -l verbose -d (N_ "Be verbose when showing status")
+complete $contents_opt -s l -l list --description "List the files inside a Gem"
+complete $contents_opt -s V -l version --description "Specify version for gem to view"
+complete $contents_opt -s s -l spec-dir --description "Search for gems under specific paths" -x
+complete $contents_opt -s v -l verbose --description "Be verbose when showing status"
##
# dependency
set -l dep_opt -c gem -n 'contains dependency (commandline -poc)'
-complete $dep_opt -s v -l version -d (N_ "Specify version of gem to uninstall") -x
-complete $dep_opt -s r -l reverse-dependencies -d (N_ "Include reverse dependencies in the output")
-complete $dep_opt -l no-reverse-dependencies -d (N_ "Don't include reverse dependencies in the output")
-complete $dep_opt -s p -l pipe -d (N_ "Pipe Format (name --version ver)")
+complete $dep_opt -s v -l version --description "Specify version of gem to uninstall" -x
+complete $dep_opt -s r -l reverse-dependencies --description "Include reverse dependencies in the output"
+complete $dep_opt -l no-reverse-dependencies --description "Don't include reverse dependencies in the output"
+complete $dep_opt -s p -l pipe --description "Pipe Format (name --version ver)"
##
# environment
@@ -94,104 +94,104 @@ complete $help_opt -xa 'commands\t"'(_ "list all 'gem' commands")'" examples\t"'
##
# install
set -l install_opt -c gem -n 'contains install (commandline -poc)'
-complete $install_opt -s v -l version -d (N_ "Specify version of gem to install") -x
-complete $install_opt -s l -l local -d (N_ "Restrict operations to the LOCAL domain (default)")
-complete $install_opt -s r -l remote -d (N_ "Restrict operations to the REMOTE domain")
-complete $install_opt -s b -l both -d (N_ "Allow LOCAL and REMOTE operations")
-complete $install_opt -s i -l install-dir -d (N_ "Gem repository directory to get installed gems") -x
-complete $install_opt -s d -l rdoc -d (N_ "Generate RDoc documentation for the gem on install")
-complete $install_opt -l no-rdoc -d (N_ "Don't generate RDoc documentation for the gem on install")
-complete $install_opt -l ri -d (N_ "Generate RI documentation for the gem on install")
-complete $install_opt -l no-ri -d (N_ "Don't generate RI documentation for the gem on install")
-complete $install_opt -s f -l force -d (N_ "Force gem to install, bypassing dependency checks")
-complete $install_opt -l no-force -d (N_ "Don't force gem to install, bypassing dependency checks")
-complete $install_opt -s t -l test -d (N_ "Run unit tests prior to installation")
-complete $install_opt -l no-test -d (N_ "Don't run unit tests prior to installation")
-complete $install_opt -s w -l wrappers -d (N_ "Use bin wrappers for executables")
-complete $install_opt -l no-wrappers -d (N_ "Don't use bin wrappers for executables")
-complete $install_opt -s P -l trust-policy -d (N_ "Specify gem trust policy") -x
-complete $install_opt -l ignore-dependencies -d (N_ "Do not install any required dependent gems")
-complete $install_opt -s y -l include-dependencies -d (N_ "Unconditionally install the required dependent gems")
+complete $install_opt -s v -l version --description "Specify version of gem to install" -x
+complete $install_opt -s l -l local --description "Restrict operations to the LOCAL domain (default)"
+complete $install_opt -s r -l remote --description "Restrict operations to the REMOTE domain"
+complete $install_opt -s b -l both --description "Allow LOCAL and REMOTE operations"
+complete $install_opt -s i -l install-dir --description "Gem repository directory to get installed gems" -x
+complete $install_opt -s d -l rdoc --description "Generate RDoc documentation for the gem on install"
+complete $install_opt -l no-rdoc --description "Don't generate RDoc documentation for the gem on install"
+complete $install_opt -l ri --description "Generate RI documentation for the gem on install"
+complete $install_opt -l no-ri --description "Don't generate RI documentation for the gem on install"
+complete $install_opt -s f -l force --description "Force gem to install, bypassing dependency checks"
+complete $install_opt -l no-force --description "Don't force gem to install, bypassing dependency checks"
+complete $install_opt -s t -l test --description "Run unit tests prior to installation"
+complete $install_opt -l no-test --description "Don't run unit tests prior to installation"
+complete $install_opt -s w -l wrappers --description "Use bin wrappers for executables"
+complete $install_opt -l no-wrappers --description "Don't use bin wrappers for executables"
+complete $install_opt -s P -l trust-policy --description "Specify gem trust policy" -x
+complete $install_opt -l ignore-dependencies --description "Do not install any required dependent gems"
+complete $install_opt -s y -l include-dependencies --description "Unconditionally install the required dependent gems"
##
# list
set -l list_opt -c gem -n 'contains list (commandline -poc)'
-complete $list_opt -s d -l details -d (N_ "Display detailed information of gem(s)")
-complete $list_opt -l no-details -d (N_ "Don't display detailed information of gem(s)")
-complete $list_opt -s l -l local -d (N_ "Restrict operations to the LOCAL domain (default)")
-complete $list_opt -s r -l remote -d (N_ "Restrict operations to the REMOTE domain")
-complete $list_opt -s b -l both -d (N_ "Allow LOCAL and REMOTE operations")
+complete $list_opt -s d -l details --description "Display detailed information of gem(s)"
+complete $list_opt -l no-details --description "Don't display detailed information of gem(s)"
+complete $list_opt -s l -l local --description "Restrict operations to the LOCAL domain (default)"
+complete $list_opt -s r -l remote --description "Restrict operations to the REMOTE domain"
+complete $list_opt -s b -l both --description "Allow LOCAL and REMOTE operations"
##
# query
set -l query_opt -c gem -n 'contains query (commandline -poc)'
-complete $query_opt -s n -l name-matches -d (N_ "Name of gem(s) to query on matches the provided REGEXP") -x
-complete $query_opt -s d -l details -d (N_ "Display detailed information of gem(s)")
-complete $query_opt -l no-details -d (N_ "Don't display detailed information of gem(s)")
-complete $query_opt -s l -l local -d (N_ "Restrict operations to the LOCAL domain (default)")
-complete $query_opt -s r -l remote -d (N_ "Restrict operations to the REMOTE domain")
-complete $query_opt -s b -l both -d (N_ "Allow LOCAL and REMOTE operations")
+complete $query_opt -s n -l name-matches --description "Name of gem(s) to query on matches the provided REGEXP" -x
+complete $query_opt -s d -l details --description "Display detailed information of gem(s)"
+complete $query_opt -l no-details --description "Don't display detailed information of gem(s)"
+complete $query_opt -s l -l local --description "Restrict operations to the LOCAL domain (default)"
+complete $query_opt -s r -l remote --description "Restrict operations to the REMOTE domain"
+complete $query_opt -s b -l both --description "Allow LOCAL and REMOTE operations"
##
# rdoc
set -l rdoc_opt -c gem -n 'contains rdoc (commandline -poc)'
-complete $rdoc_opt -l all -d (N_ "Generate RDoc/RI documentation for all installed gems")
-complete $rdoc_opt -l rdoc -d (N_ "Include RDoc generated documents")
-complete $rdoc_opt -l no-rdoc -d (N_ "Don't include RDoc generated documents")
-complete $rdoc_opt -l ri -d (N_ "Include RI generated documents")
-complete $rdoc_opt -l no-ri -d (N_ "Don't include RI generated documents")
-complete $rdoc_opt -s v -l version -d (N_ "Specify version of gem to rdoc") -x
+complete $rdoc_opt -l all --description "Generate RDoc/RI documentation for all installed gems"
+complete $rdoc_opt -l rdoc --description "Include RDoc generated documents"
+complete $rdoc_opt -l no-rdoc --description "Don't include RDoc generated documents"
+complete $rdoc_opt -l ri --description "Include RI generated documents"
+complete $rdoc_opt -l no-ri --description "Don't include RI generated documents"
+complete $rdoc_opt -s v -l version --description "Specify version of gem to rdoc" -x
##
# search
set -l search_opt -c gem -n 'contains search (commandline -poc)'
-complete $search_opt -s d -l details -d (N_ "Display detailed information of gem(s)")
-complete $search_opt -l no-details -d (N_ "Don't display detailed information of gem(s)")
-complete $search_opt -s l -l local -d (N_ "Restrict operations to the LOCAL domain (default)")
-complete $search_opt -s r -l remote -d (N_ "Restrict operations to the REMOTE domain")
-complete $search_opt -s b -l both -d (N_ "Allow LOCAL and REMOTE operations")
+complete $search_opt -s d -l details --description "Display detailed information of gem(s)"
+complete $search_opt -l no-details --description "Don't display detailed information of gem(s)"
+complete $search_opt -s l -l local --description "Restrict operations to the LOCAL domain (default)"
+complete $search_opt -s r -l remote --description "Restrict operations to the REMOTE domain"
+complete $search_opt -s b -l both --description "Allow LOCAL and REMOTE operations"
##
# specification
set -l specification_opt -c gem -n 'contains specification (commandline -poc)'
-complete $specification_opt -s v -l version -d (N_ "Specify version of gem to examine") -x
-complete $specification_opt -s l -l local -d (N_ "Restrict operations to the LOCAL domain (default)")
-complete $specification_opt -s r -l remote -d (N_ "Restrict operations to the REMOTE domain")
-complete $specification_opt -s b -l both -d (N_ "Allow LOCAL and REMOTE operations")
-complete $specification_opt -l all -d (N_ "Output specifications for all versions of the gem")
+complete $specification_opt -s v -l version --description "Specify version of gem to examine" -x
+complete $specification_opt -s l -l local --description "Restrict operations to the LOCAL domain (default)"
+complete $specification_opt -s r -l remote --description "Restrict operations to the REMOTE domain"
+complete $specification_opt -s b -l both --description "Allow LOCAL and REMOTE operations"
+complete $specification_opt -l all --description "Output specifications for all versions of the gem"
##
# uninstall
set -l uninstall_opt -c gem -n 'contains uninstall (commandline -poc)'
-complete $uninstall_opt -s a -l all -d (N_ "Uninstall all matching versions")
-complete $uninstall_opt -l no-all -d (N_ "Don't uninstall all matching versions")
-complete $uninstall_opt -s i -l ignore-dependencies -d (N_ "Ignore dependency requirements while uninstalling")
-complete $uninstall_opt -l no-ignore-dependencies -d (N_ "Don't ignore dependency requirements while uninstalling")
-complete $uninstall_opt -s x -l executables -d (N_ "Uninstall applicable executables without confirmation")
-complete $uninstall_opt -l no-executables -d (N_ "Don't uninstall applicable executables without confirmation")
-complete $uninstall_opt -s v -l version -d (N_ "Specify version of gem to uninstall") -x
+complete $uninstall_opt -s a -l all --description "Uninstall all matching versions"
+complete $uninstall_opt -l no-all --description "Don't uninstall all matching versions"
+complete $uninstall_opt -s i -l ignore-dependencies --description "Ignore dependency requirements while uninstalling"
+complete $uninstall_opt -l no-ignore-dependencies --description "Don't ignore dependency requirements while uninstalling"
+complete $uninstall_opt -s x -l executables --description "Uninstall applicable executables without confirmation"
+complete $uninstall_opt -l no-executables --description "Don't uninstall applicable executables without confirmation"
+complete $uninstall_opt -s v -l version --description "Specify version of gem to uninstall" -x
##
# unpack
set -l unpack_opt -c gem -n 'contains unpack (commandline -poc)'
-complete $unpack_opt -s v -l version -d (N_ "Specify version of gem to unpack") -x
+complete $unpack_opt -s v -l version --description "Specify version of gem to unpack" -x
##
# update
set -l update_opt -c gem -n 'contains update (commandline -poc)'
-complete $update_opt -s i -l install-dir -d (N_ "Gem repository directory to get installed gems")
-complete $update_opt -s d -l rdoc -d (N_ "Generate RDoc documentation for the gem on install")
-complete $update_opt -l no-rdoc -d (N_ "Don't generate RDoc documentation for the gem on install")
-complete $update_opt -l ri -d (N_ "Generate RI documentation for the gem on install")
-complete $update_opt -l no-ri -d (N_ "Don't generate RI documentation for the gem on install")
-complete $update_opt -s f -l force -d (N_ "Force gem to install, bypassing dependency checks")
-complete $update_opt -l no-force -d (N_ "Don't force gem to install, bypassing dependency checks")
-complete $update_opt -s t -l test -d (N_ "Run unit tests prior to installation")
-complete $update_opt -l no-test -d (N_ "Don't run unit tests prior to installation")
-complete $update_opt -s w -l wrappers -d (N_ "Use bin wrappers for executables")
-complete $update_opt -l no-wrappers -d (N_ "Don't use bin wrappers for executables")
-complete $update_opt -s P -l trust-policy -d (N_ "Specify gem trust policy") -x
-complete $update_opt -l ignore-dependencies -d (N_ "Do not install any required dependent gems")
-complete $update_opt -s y -l include-dependencies -d (N_ "Unconditionally install the required dependent gems")
-complete $update_opt -l system -d (N_ "Update the RubyGems system software")
+complete $update_opt -s i -l install-dir --description "Gem repository directory to get installed gems"
+complete $update_opt -s d -l rdoc --description "Generate RDoc documentation for the gem on install"
+complete $update_opt -l no-rdoc --description "Don't generate RDoc documentation for the gem on install"
+complete $update_opt -l ri --description "Generate RI documentation for the gem on install"
+complete $update_opt -l no-ri --description "Don't generate RI documentation for the gem on install"
+complete $update_opt -s f -l force --description "Force gem to install, bypassing dependency checks"
+complete $update_opt -l no-force --description "Don't force gem to install, bypassing dependency checks"
+complete $update_opt -s t -l test --description "Run unit tests prior to installation"
+complete $update_opt -l no-test --description "Don't run unit tests prior to installation"
+complete $update_opt -s w -l wrappers --description "Use bin wrappers for executables"
+complete $update_opt -l no-wrappers --description "Don't use bin wrappers for executables"
+complete $update_opt -s P -l trust-policy --description "Specify gem trust policy" -x
+complete $update_opt -l ignore-dependencies --description "Do not install any required dependent gems"
+complete $update_opt -s y -l include-dependencies --description "Unconditionally install the required dependent gems"
+complete $update_opt -l system --description "Update the RubyGems system software"
diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 1d94a447..69be5132 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -45,280 +45,280 @@ end
# gpg subcommands
#
-complete -c gpg -s s -l sign -d (N_ "Make a signature")
-complete -c gpg -l clearsign -d (N_ "Make a clear text signature")
-complete -c gpg -s b -l detach-sign -d (N_ "Make a detached signature")
-complete -c gpg -s e -l encrypt -d (N_ "Encrypt data")
-complete -c gpg -s c -l symmetric -d (N_ "Encrypt with a symmetric cipher using a passphrase")
-complete -c gpg -l store -d (N_ "Store only (make a simple RFC1991 packet)")
-complete -c gpg -l decrypt -d (N_ "Decrypt specified file or stdin")
-complete -c gpg -l verify -d (N_ "Assume specified file or stdin is sigfile and verify it")
-complete -c gpg -l multifile -d (N_ "Modify certain other commands to accept multiple files for processing")
-complete -c gpg -l verify-files -d (N_ "Identical to '--multifile --verify'")
-complete -c gpg -l encrypt-files -d (N_ "Identical to '--multifile --encrypt'")
-complete -c gpg -l decrypt-files -d (N_ "Identical to --multifile --decrypt")
-
-complete -c gpg -l list-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (N_ "List all keys from the public keyrings, or just the ones given on the command line")
-complete -c gpg -l list-public-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (N_ "List all keys from the public keyrings, or just the ones given on the command line")
-complete -c gpg -s K -l list-secret-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (N_ "List all keys from the secret keyrings, or just the ones given on the command line")
-complete -c gpg -l list-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "Same as --list-keys, but the signatures are listed too")
-
-complete -c gpg -l check-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "Same as --list-keys, but the signatures are listed and verified")
-complete -c gpg -l fingerprint -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "List all keys with their fingerprints")
-complete -c gpg -l gen-key -d (N_ "Generate a new key pair")
-
-complete -c gpg -l edit-key -d (N_ "Present a menu which enables you to do all key related tasks") -xa "(__fish_complete_gpg_user_id)"
-
-complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Sign a public key with your secret key")
-complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Sign a public key with your secret key but mark it as non exportable")
-
-complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Remove key from the public keyring")
-complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Remove key from the secret and public keyring")
-complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Same as --delete-key, but if a secret key exists, it will be removed first")
-
-complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d (N_ "Generate a revocation certificate for the complete key")
-complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d (N_ "Generate a designated revocation certificate for a key")
+complete -c gpg -s s -l sign --description "Make a signature"
+complete -c gpg -l clearsign --description "Make a clear text signature"
+complete -c gpg -s b -l detach-sign --description "Make a detached signature"
+complete -c gpg -s e -l encrypt --description "Encrypt data"
+complete -c gpg -s c -l symmetric --description "Encrypt with a symmetric cipher using a passphrase"
+complete -c gpg -l store --description "Store only (make a simple RFC1991 packet)"
+complete -c gpg -l decrypt --description "Decrypt specified file or stdin"
+complete -c gpg -l verify --description "Assume specified file or stdin is sigfile and verify it"
+complete -c gpg -l multifile --description "Modify certain other commands to accept multiple files for processing"
+complete -c gpg -l verify-files --description "Identical to '--multifile --verify'"
+complete -c gpg -l encrypt-files --description "Identical to '--multifile --encrypt'"
+complete -c gpg -l decrypt-files --description "Identical to --multifile --decrypt"
+
+complete -c gpg -l list-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" --description "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -l list-public-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" --description "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -s K -l list-secret-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" --description "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c gpg -l list-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description "Same as --list-keys, but the signatures are listed too"
+
+complete -c gpg -l check-sigs -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg -l fingerprint -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description "List all keys with their fingerprints"
+complete -c gpg -l gen-key --description "Generate a new key pair"
+
+complete -c gpg -l edit-key --description "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
+
+complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" --description "Sign a public key with your secret key"
+complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" --description "Sign a public key with your secret key but mark it as non exportable"
+
+complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" --description "Remove key from the public keyring"
+complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" --description "Remove key from the secret and public keyring"
+complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" --description "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a revocation certificate for the complete key"
+complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a designated revocation certificate for a key"
complete -c gpg -l export -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "Export all or the given keys from all keyrings" )
-complete -c gpg -l send-keys -xa "(__fish_append , (__fish_complete_gpg_user_id))" -d (N_ "Same as --export but sends the keys to a keyserver")
-complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d (N_ "Same as --export, but exports the secret keys instead")
-complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d (N_ "Same as --export, but exports the secret keys instead")
+complete -c gpg -l send-keys -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description "Same as --export but sends the keys to a keyserver"
+complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" --description "Same as --export, but exports the secret keys instead"
+complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" --description "Same as --export, but exports the secret keys instead"
complete -c gpg -l import -xa "(__fish_complete_gpg_user_id)" -d (N_ "Import/merge keys" )
complete -c gpg -l fast-import -xa "(__fish_complete_gpg_user_id)" -d (N_ "Import/merge keys" )
-complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d (N_ "Import the keys with the given key IDs from a keyserver")
-complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d (N_ "Request updates from a keyserver for keys that already exist on the local keyring")
-complete -c gpg -l search-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" -d (N_ "Search the keyserver for the given names")
-complete -c gpg -l update-trustdb -d (N_ "Do trust database maintenance")
-complete -c gpg -l check-trustdb -d (N_ "Do trust database maintenance without user interaction")
+complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" --description "Import the keys with the given key IDs from a keyserver"
+complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" --description "Request updates from a keyserver for keys that already exist on the local keyring"
+complete -c gpg -l search-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" --description "Search the keyserver for the given names"
+complete -c gpg -l update-trustdb --description "Do trust database maintenance"
+complete -c gpg -l check-trustdb --description "Do trust database maintenance without user interaction"
-complete -c gpg -l export-ownertrust -d (N_ "Send the ownertrust values to stdout")
-complete -c gpg -l import-ownertrust -d (N_ "Update the trustdb with the ownertrust values stored in specified files or stdin")
+complete -c gpg -l export-ownertrust --description "Send the ownertrust values to stdout"
+complete -c gpg -l import-ownertrust --description "Update the trustdb with the ownertrust values stored in specified files or stdin"
-complete -c gpg -l rebuild-keydb-caches -d (N_ "Create signature caches in the keyring")
+complete -c gpg -l rebuild-keydb-caches --description "Create signature caches in the keyring"
-complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d (N_ "Print message digest of specified algorithm for all given files or stdin")
-complete -c gpg -l print-mds -d (N_ "Print message digest of all algorithms for all given files or stdin")
+complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" --description "Print message digest of specified algorithm for all given files or stdin"
+complete -c gpg -l print-mds --description "Print message digest of all algorithms for all given files or stdin"
-complete -c gpg -l gen-random -xa "0 1 2" -d (N_ "Emit specified number of random bytes of the given quality level")
+complete -c gpg -l gen-random -xa "0 1 2" --description "Emit specified number of random bytes of the given quality level"
-complete -c gpg -l version -d (N_ "Display version and supported algorithms, and exit")
-complete -c gpg -l warranty -d (N_ "Display warranty and exit")
-complete -c gpg -s h -l help -d (N_ "Display help and exit")
+complete -c gpg -l version --description "Display version and supported algorithms, and exit"
+complete -c gpg -l warranty --description "Display warranty and exit"
+complete -c gpg -s h -l help --description "Display help and exit"
#
# gpg options
#
-complete -c gpg -s a -l armor -d (N_ "Create ASCII armored output")
-complete -c gpg -s o -l output -r -d (N_ "Write output to specified file")
+complete -c gpg -s a -l armor --description "Create ASCII armored output"
+complete -c gpg -s o -l output -r --description "Write output to specified file"
-complete -c gpg -l max-output -d (N_ "Sets a limit on the number of bytes that will be generated when processing a file") -x
+complete -c gpg -l max-output --description "Sets a limit on the number of bytes that will be generated when processing a file" -x
-complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d (N_ "Use specified key as the key to sign with")
-complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d (N_ "Use specified key as the default key to sign with")
+complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" --description "Use specified key as the key to sign with"
+complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" --description "Use specified key as the default key to sign with"
-complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d (N_ "Encrypt for specified user id")
-complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d (N_ "Encrypt for specified user id, but hide the keyid of the key")
-complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d (N_ "Use specified user id as default recipient")
-complete -c gpg -l default-recipient-self -d (N_ "Use the default key as default recipient")
-complete -c gpg -l no-default-recipient -d (N_ "Reset --default-recipient and --default-recipient-self")
+complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" --description "Encrypt for specified user id"
+complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" --description "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" --description "Use specified user id as default recipient"
+complete -c gpg -l default-recipient-self --description "Use the default key as default recipient"
+complete -c gpg -l no-default-recipient --description "Reset --default-recipient and --default-recipient-self"
-complete -c gpg -s v -l verbose -d (N_ "Give more information during processing")
-complete -c gpg -s q -l quiet -d (N_ "Quiet mode")
+complete -c gpg -s v -l verbose --description "Give more information during processing"
+complete -c gpg -s q -l quiet --description "Quiet mode"
-complete -c gpg -s z -d (N_ "Compression level") -xa "(seq 1 9)"
-complete -c gpg -l compress-level -d (N_ "Compression level") -xa "(seq 1 9)"
-complete -c gpg -l bzip2-compress-level -d (N_ "Compression level") -xa "(seq 1 9)"
-complete -c gpg -l bzip2-decompress-lowmem -d (N_ "Use a different decompression method for BZIP2 compressed files")
+complete -c gpg -s z --description "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l compress-level --description "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-compress-level --description "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-decompress-lowmem --description "Use a different decompression method for BZIP2 compressed files"
-complete -c gpg -s t -l textmode -d (N_ "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings")
-complete -c gpg -l no-textmode -d (N_ "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings")
+complete -c gpg -s t -l textmode --description "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c gpg -l no-textmode --description "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg -s n -l dry-run -d (N_ "Don't make any changes (this is not completely implemented)")
+complete -c gpg -s n -l dry-run --description "Don't make any changes (this is not completely implemented)"
-complete -c gpg -s i -l interactive -d (N_ "Prompt before overwrite")
+complete -c gpg -s i -l interactive --description "Prompt before overwrite"
-complete -c gpg -l batch -d (N_ "Batch mode")
-complete -c gpg -l no-batch -d (N_ "Don't use batch mode")
-complete -c gpg -l no-tty -d (N_ "Never write output to terminal")
+complete -c gpg -l batch --description "Batch mode"
+complete -c gpg -l no-batch --description "Don't use batch mode"
+complete -c gpg -l no-tty --description "Never write output to terminal"
-complete -c gpg -l yes -d (N_ "Assume yes on most questions")
-complete -c gpg -l no -d (N_ "Assume no on most questions")
+complete -c gpg -l yes --description "Assume yes on most questions"
+complete -c gpg -l no --description "Assume no on most questions"
-complete -c gpg -l ask-cert-level -d (N_ "Prompt for a certification level when making a key signature")
-complete -c gpg -l no-ask-cert-level -d (N_ "Don't prompt for a certification level when making a key signature")
-complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d (N_ "The default certification level to use for the level check when signing a key")
-complete -c gpg -l min-cert-level -xa "0 1 2 3" -d (N_ "Disregard any signatures with a certification level below specified level when building the trust database")
+complete -c gpg -l ask-cert-level --description "Prompt for a certification level when making a key signature"
+complete -c gpg -l no-ask-cert-level --description "Don't prompt for a certification level when making a key signature"
+complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" --description "The default certification level to use for the level check when signing a key"
+complete -c gpg -l min-cert-level -xa "0 1 2 3" --description "Disregard any signatures with a certification level below specified level when building the trust database"
-complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d (N_ "Assume that the specified key is as trustworthy as one of your own secret keys")
-complete -c gpg -l trust-model -xa "pgp classic direct always" -d (N_ "Specify trust model")
+complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" --description "Assume that the specified key is as trustworthy as one of your own secret keys"
+complete -c gpg -l trust-model -xa "pgp classic direct always" --description "Specify trust model"
-complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d (N_ "Select how to display key IDs")
+complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" --description "Select how to display key IDs"
-complete -c gpg -l keyserver -x -d (N_ "Use specified keyserver")
-complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d (N_ "Options for the keyserver")
+complete -c gpg -l keyserver -x --description "Use specified keyserver"
+complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" --description "Options for the keyserver"
-complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d (N_ "Options for importing keys")
-complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d (N_ "Options for exporting keys")
-complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d (N_ "Options for listing keys and signatures")
-complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d (N_ "Options for verifying signatures")
+complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" --description "Options for importing keys"
+complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" --description "Options for exporting keys"
+complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" --description "Options for listing keys and signatures"
+complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" --description "Options for verifying signatures"
-complete -c gpg -l photo-viewer -r -d (N_ "The command line that should be run to view a photo ID")
-complete -c gpg -l exec-path -r -d (N_ "Sets a list of directories to search for photo viewers and keyserver helpers")
+complete -c gpg -l photo-viewer -r --description "The command line that should be run to view a photo ID"
+complete -c gpg -l exec-path -r --description "Sets a list of directories to search for photo viewers and keyserver helpers"
-complete -c gpg -l show-keyring -d (N_ "Display the keyring name at the head of key listings to show which keyring a given key resides on")
-complete -c gpg -l keyring -r -d (N_ "Add specified file to the current list of keyrings")
+complete -c gpg -l show-keyring --description "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+complete -c gpg -l keyring -r --description "Add specified file to the current list of keyrings"
-complete -c gpg -l secret-keyring -r -d (N_ "Add specified file to the current list of secret keyrings")
-complete -c gpg -l primary-keyring -r -d (N_ "Designate specified file as the primary public keyring")
+complete -c gpg -l secret-keyring -r --description "Add specified file to the current list of secret keyrings"
+complete -c gpg -l primary-keyring -r --description "Designate specified file as the primary public keyring"
-complete -c gpg -l trustdb-name -r -d (N_ "Use specified file instead of the default trustdb")
-complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d (N_ "Set the home directory")
-complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d (N_ "Set the native character set")
+complete -c gpg -l trustdb-name -r --description "Use specified file instead of the default trustdb"
+complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" --description "Set the home directory"
+complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " --description "Set the native character set"
-complete -c gpg -l utf8-strings -d (N_ "Assume that following command line arguments are given in UTF8")
-complete -c gpg -l no-utf8-strings -d (N_ "Assume that following arguments are encoded in the character set specified by --display-charset")
-complete -c gpg -l options -r -d (N_ "Read options from specified file, do not read the default options file")
-complete -c gpg -l no-options -d (N_ "Shortcut for '--options /dev/null'")
-complete -c gpg -l load-extension -x -d (N_ "Load an extension module")
+complete -c gpg -l utf8-strings --description "Assume that following command line arguments are given in UTF8"
+complete -c gpg -l no-utf8-strings --description "Assume that following arguments are encoded in the character set specified by --display-charset"
+complete -c gpg -l options -r --description "Read options from specified file, do not read the default options file"
+complete -c gpg -l no-options --description "Shortcut for '--options /dev/null'"
+complete -c gpg -l load-extension -x --description "Load an extension module"
-complete -c gpg -l status-fd -x -d (N_ "Write special status strings to the specified file descriptor")
-complete -c gpg -l logger-fd -x -d (N_ "Write log output to the specified file descriptor")
-complete -c gpg -l attribute-fd -d (N_ "Write attribute subpackets to the specified file descriptor")
+complete -c gpg -l status-fd -x --description "Write special status strings to the specified file descriptor"
+complete -c gpg -l logger-fd -x --description "Write log output to the specified file descriptor"
+complete -c gpg -l attribute-fd --description "Write attribute subpackets to the specified file descriptor"
-complete -c gpg -l sk-comments -d (N_ "Include secret key comment packets when exporting secret keys")
-complete -c gpg -l no-sk-comments -d (N_ "Don't include secret key comment packets when exporting secret keys")
+complete -c gpg -l sk-comments --description "Include secret key comment packets when exporting secret keys"
+complete -c gpg -l no-sk-comments --description "Don't include secret key comment packets when exporting secret keys"
-complete -c gpg -l comment -x -d (N_ "Use specified string as comment string")
-complete -c gpg -l no-comments -d (N_ "Don't use a comment string")
+complete -c gpg -l comment -x --description "Use specified string as comment string"
+complete -c gpg -l no-comments --description "Don't use a comment string"
-complete -c gpg -l emit-version -d (N_ "Include the version string in ASCII armored output")
-complete -c gpg -l no-emit-version -d (N_ "Don't include the version string in ASCII armored output")
+complete -c gpg -l emit-version --description "Include the version string in ASCII armored output"
+complete -c gpg -l no-emit-version --description "Don't include the version string in ASCII armored output"
complete -c gpg -l sig-notation -x
complete -c gpg -l cert-notation -x
-complete -c gpg -s N -l set-notation -x -d (N_ "Put the specified name value pair into the signature as notation data")
-complete -c gpg -l sig-policy-url -x -d (N_ "Set signature policy")
-complete -c gpg -l cert-policy-url -x -d (N_ "Set certificate policy")
-complete -c gpg -l set-policy-url -x -d (N_ "Set signature and certificate policy")
-complete -c gpg -l sig-keyserver-url -x -d (N_ "Use specified URL as a preferred keyserver for data signatures")
+complete -c gpg -s N -l set-notation -x --description "Put the specified name value pair into the signature as notation data"
+complete -c gpg -l sig-policy-url -x --description "Set signature policy"
+complete -c gpg -l cert-policy-url -x --description "Set certificate policy"
+complete -c gpg -l set-policy-url -x --description "Set signature and certificate policy"
+complete -c gpg -l sig-keyserver-url -x --description "Use specified URL as a preferred keyserver for data signatures"
-complete -c gpg -l set-filename -x -d (N_ "Use specified string as the filename which is stored inside messages")
+complete -c gpg -l set-filename -x --description "Use specified string as the filename which is stored inside messages"
-complete -c gpg -l for-your-eyes-only -d (N_ "Set the 'for your eyes only' flag in the message")
-complete -c gpg -l no-for-your-eyes-only -d (N_ "Clear the 'for your eyes only' flag in the message")
+complete -c gpg -l for-your-eyes-only --description "Set the 'for your eyes only' flag in the message"
+complete -c gpg -l no-for-your-eyes-only --description "Clear the 'for your eyes only' flag in the message"
-complete -c gpg -l use-embedded-filename -d (N_ "Create file with name as given in data")
-complete -c gpg -l no-use-embedded-filename -d (N_ "Don't create file with name as given in data")
+complete -c gpg -l use-embedded-filename --description "Create file with name as given in data"
+complete -c gpg -l no-use-embedded-filename --description "Don't create file with name as given in data"
-complete -c gpg -l completes-needed -x -d (N_ "Number of completely trusted users to introduce a new key signer (defaults to 1)")
-complete -c gpg -l marginals-needed -x -d (N_ "Number of marginally trusted users to introduce a new key signer (defaults to 3)")
+complete -c gpg -l completes-needed -x --description "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+complete -c gpg -l marginals-needed -x --description "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-complete -c gpg -l max-cert-depth -x -d (N_ "Maximum depth of a certification chain (default is 5)")
+complete -c gpg -l max-cert-depth -x --description "Maximum depth of a certification chain (default is 5)"
-complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (N_ "Use specified cipher algorithm")
-complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (N_ "Use specified message digest algorithm")
-complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d (N_ "Use specified compression algorithm")
-complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (N_ "Use specified message digest algorithm when signing a key")
-complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (N_ "Use specified cipher algorithm to protect secret keys")
-complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d (N_ "Use specified digest algorithm to mangle the passphrases")
-complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d (N_ "Selects how passphrases are mangled")
+complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" --description "Use specified cipher algorithm"
+complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" --description "Use specified message digest algorithm"
+complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" --description "Use specified compression algorithm"
+complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" --description "Use specified message digest algorithm when signing a key"
+complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" --description "Use specified cipher algorithm to protect secret keys"
+complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" --description "Use specified digest algorithm to mangle the passphrases"
+complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" --description "Selects how passphrases are mangled"
complete -c gpg -l simple-sk-checksum -d (N_ "Integrity protect secret keys by using a SHA-1 checksum" )
-complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d (N_ "Never allow the use of specified cipher algorithm")
-complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d (N_ "Never allow the use of specified public key algorithm")
+complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" --description "Never allow the use of specified cipher algorithm"
+complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" --description "Never allow the use of specified public key algorithm"
-complete -c gpg -l no-sig-cache -d (N_ "Do not cache the verification status of key signatures")
-complete -c gpg -l no-sig-create-check -d (N_ "Do not verify each signature right after creation")
+complete -c gpg -l no-sig-cache --description "Do not cache the verification status of key signatures"
+complete -c gpg -l no-sig-create-check --description "Do not verify each signature right after creation"
-complete -c gpg -l auto-check-trustdb -d (N_ "Automatically run the --check-trustdb command internally when needed")
-complete -c gpg -l no-auto-check-trustdb -d (N_ "Never automatically run the --check-trustdb")
+complete -c gpg -l auto-check-trustdb --description "Automatically run the --check-trustdb command internally when needed"
+complete -c gpg -l no-auto-check-trustdb --description "Never automatically run the --check-trustdb"
-complete -c gpg -l throw-keyids -d (N_ "Do not put the recipient keyid into encrypted packets")
-complete -c gpg -l no-throw-keyids -d (N_ "Put the recipient keyid into encrypted packets")
-complete -c gpg -l not-dash-escaped -d (N_ "Change the behavior of cleartext signatures so that they can be used for patch files")
+complete -c gpg -l throw-keyids --description "Do not put the recipient keyid into encrypted packets"
+complete -c gpg -l no-throw-keyids --description "Put the recipient keyid into encrypted packets"
+complete -c gpg -l not-dash-escaped --description "Change the behavior of cleartext signatures so that they can be used for patch files"
-complete -c gpg -l escape-from-lines -d (N_ "Mangle From-field of email headers (default)")
-complete -c gpg -l no-escape-from-lines -d (N_ "Do not mangle From-field of email headers")
+complete -c gpg -l escape-from-lines --description "Mangle From-field of email headers (default)"
+complete -c gpg -l no-escape-from-lines --description "Do not mangle From-field of email headers"
-complete -c gpg -l passphrase-fd -x -d (N_ "Read passphrase from specified file descriptor")
-complete -c gpg -l command-fd -x -d (N_ "Read user input from specified file descriptor")
+complete -c gpg -l passphrase-fd -x --description "Read passphrase from specified file descriptor"
+complete -c gpg -l command-fd -x --description "Read user input from specified file descriptor"
-complete -c gpg -l use-agent -d (N_ "Try to use the GnuPG-Agent")
-complete -c gpg -l no-use-agent -d (N_ "Do not try to use the GnuPG-Agent")
-complete -c gpg -l gpg-agent-info -x -d (N_ "Override value of GPG_AGENT_INFO environment variable")
+complete -c gpg -l use-agent --description "Try to use the GnuPG-Agent"
+complete -c gpg -l no-use-agent --description "Do not try to use the GnuPG-Agent"
+complete -c gpg -l gpg-agent-info -x --description "Override value of GPG_AGENT_INFO environment variable"
-complete -c gpg -l force-v3-sigs -d (N_ "Force v3 signatures for signatures on data")
-complete -c gpg -l no-force-v3-sigs -d (N_ "Do not force v3 signatures for signatures on data")
+complete -c gpg -l force-v3-sigs --description "Force v3 signatures for signatures on data"
+complete -c gpg -l no-force-v3-sigs --description "Do not force v3 signatures for signatures on data"
-complete -c gpg -l force-v4-certs -d (N_ "Always use v4 key signatures even on v3 keys")
-complete -c gpg -l no-force-v4-certs -d (N_ "Don't use v4 key signatures on v3 keys")
+complete -c gpg -l force-v4-certs --description "Always use v4 key signatures even on v3 keys"
+complete -c gpg -l no-force-v4-certs --description "Don't use v4 key signatures on v3 keys"
-complete -c gpg -l force-mdc -d (N_ "Force the use of encryption with a modification detection code")
-complete -c gpg -l disable-mdc -d (N_ "Disable the use of the modification detection code")
+complete -c gpg -l force-mdc --description "Force the use of encryption with a modification detection code"
+complete -c gpg -l disable-mdc --description "Disable the use of the modification detection code"
-complete -c gpg -l allow-non-selfsigned-uid -d (N_ "Allow the import and use of keys with user IDs which are not self-signed")
-complete -c gpg -l no-allow-non-selfsigned-uid -d (N_ "Do not allow the import and use of keys with user IDs which are not self-signed")
+complete -c gpg -l allow-non-selfsigned-uid --description "Allow the import and use of keys with user IDs which are not self-signed"
+complete -c gpg -l no-allow-non-selfsigned-uid --description "Do not allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg -l allow-freeform-uid -d (N_ "Disable all checks on the form of the user ID while generating a new one")
+complete -c gpg -l allow-freeform-uid --description "Disable all checks on the form of the user ID while generating a new one"
-complete -c gpg -l ignore-time-conflict -d (N_ "Do not fail if signature is older than key")
-complete -c gpg -l ignore-valid-from -d (N_ "Allow subkeys that have a timestamp from the future")
-complete -c gpg -l ignore-crc-error -d (N_ "Ignore CRC errors")
-complete -c gpg -l ignore-mdc-error -d (N_ "Do not fail on MDC integrity protection failure")
+complete -c gpg -l ignore-time-conflict --description "Do not fail if signature is older than key"
+complete -c gpg -l ignore-valid-from --description "Allow subkeys that have a timestamp from the future"
+complete -c gpg -l ignore-crc-error --description "Ignore CRC errors"
+complete -c gpg -l ignore-mdc-error --description "Do not fail on MDC integrity protection failure"
-complete -c gpg -l lock-once -d (N_ "Lock the databases the first time a lock is requested and do not release the lock until the process terminates")
-complete -c gpg -l lock-multiple -d (N_ "Release the locks every time a lock is no longer needed")
+complete -c gpg -l lock-once --description "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+complete -c gpg -l lock-multiple --description "Release the locks every time a lock is no longer needed"
-complete -c gpg -l no-random-seed-file -d (N_ "Do not create an internal pool file for quicker generation of random numbers")
-complete -c gpg -l no-verbose -d (N_ "Reset verbose level to 0")
-complete -c gpg -l no-greeting -d (N_ "Suppress the initial copyright message")
-complete -c gpg -l no-secmem-warning -d (N_ "Suppress the warning about 'using insecure memory'")
-complete -c gpg -l no-permission-warning -d (N_ "Suppress the warning about unsafe file and home directory (--homedir) permissions")
-complete -c gpg -l no-mdc-warning -d (N_ "Suppress the warning about missing MDC integrity protection")
+complete -c gpg -l no-random-seed-file --description "Do not create an internal pool file for quicker generation of random numbers"
+complete -c gpg -l no-verbose --description "Reset verbose level to 0"
+complete -c gpg -l no-greeting --description "Suppress the initial copyright message"
+complete -c gpg -l no-secmem-warning --description "Suppress the warning about 'using insecure memory'"
+complete -c gpg -l no-permission-warning --description "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+complete -c gpg -l no-mdc-warning --description "Suppress the warning about missing MDC integrity protection"
-complete -c gpg -l require-secmem -d (N_ "Refuse to run if GnuPG cannot get secure memory")
+complete -c gpg -l require-secmem --description "Refuse to run if GnuPG cannot get secure memory"
-complete -c gpg -l no-require-secmem -d (N_ "Do not refuse to run if GnuPG cannot get secure memory (default)")
-complete -c gpg -l no-armor -d (N_ "Assume the input data is not in ASCII armored format")
+complete -c gpg -l no-require-secmem --description "Do not refuse to run if GnuPG cannot get secure memory (default)"
+complete -c gpg -l no-armor --description "Assume the input data is not in ASCII armored format"
-complete -c gpg -l no-default-keyring -d (N_ "Do not add the default keyrings to the list of keyrings")
+complete -c gpg -l no-default-keyring --description "Do not add the default keyrings to the list of keyrings"
-complete -c gpg -l skip-verify -d (N_ "Skip the signature verification step")
+complete -c gpg -l skip-verify --description "Skip the signature verification step"
-complete -c gpg -l with-colons -d (N_ "Print key listings delimited by colons")
-complete -c gpg -l with-key-data -d (N_ "Print key listings delimited by colons (like --with-colons) and print the public key data")
-complete -c gpg -l with-fingerprint -d (N_ "Same as the command --fingerprint but changes only the format of the output and may be used together with another command")
+complete -c gpg -l with-colons --description "Print key listings delimited by colons"
+complete -c gpg -l with-key-data --description "Print key listings delimited by colons (like --with-colons) and print the public key data"
+complete -c gpg -l with-fingerprint --description "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-complete -c gpg -l fast-list-mode -d (N_ "Changes the output of the list commands to work faster")
-complete -c gpg -l fixed-list-mode -d (N_ "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps")
+complete -c gpg -l fast-list-mode --description "Changes the output of the list commands to work faster"
+complete -c gpg -l fixed-list-mode --description "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-complete -c gpg -l list-only -d (N_ "Changes the behaviour of some commands. This is like --dry-run but different")
+complete -c gpg -l list-only --description "Changes the behaviour of some commands. This is like --dry-run but different"
-complete -c gpg -l show-session-key -d (N_ "Display the session key used for one message")
-complete -c gpg -l override-session-key -x -d (N_ "Don't use the public key but the specified session key")
+complete -c gpg -l show-session-key --description "Display the session key used for one message"
+complete -c gpg -l override-session-key -x --description "Don't use the public key but the specified session key"
-complete -c gpg -l ask-sig-expire -d (N_ "Prompt for an expiration time")
-complete -c gpg -l no-ask-sig-expire -d (N_ "Do not prompt for an expiration time")
+complete -c gpg -l ask-sig-expire --description "Prompt for an expiration time"
+complete -c gpg -l no-ask-sig-expire --description "Do not prompt for an expiration time"
-complete -c gpg -l ask-cert-expire -d (N_ "Prompt for an expiration time")
-complete -c gpg -l no-ask-cert-expire -d (N_ "Do not prompt for an expiration time")
+complete -c gpg -l ask-cert-expire --description "Prompt for an expiration time"
+complete -c gpg -l no-ask-cert-expire --description "Do not prompt for an expiration time"
-complete -c gpg -l try-all-secrets -d (N_ "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key")
-complete -c gpg -l enable-special-filenames -d (N_ "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name")
+complete -c gpg -l try-all-secrets --description "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+complete -c gpg -l enable-special-filenames --description "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-complete -c gpg -l group -x -d (N_ "Sets up a named group, which is similar to aliases in email programs")
-complete -c gpg -l ungroup -d (N_ "Remove a given entry from the --group list")
-complete -c gpg -l no-groups -d (N_ "Remove all entries from the --group list")
+complete -c gpg -l group -x --description "Sets up a named group, which is similar to aliases in email programs"
+complete -c gpg -l ungroup --description "Remove a given entry from the --group list"
+complete -c gpg -l no-groups --description "Remove all entries from the --group list"
-complete -c gpg -l preserve-permissions -d (N_ "Don't change the permissions of a secret keyring back to user read/write only")
+complete -c gpg -l preserve-permissions --description "Don't change the permissions of a secret keyring back to user read/write only"
-complete -c gpg -l personal-cipher-preferences -x -d (N_ "Set the list of personal cipher preferences to the specified string")
-complete -c gpg -l personal-digest-preferences -x -d (N_ "Set the list of personal digest preferences to the specified string")
-complete -c gpg -l personal-compress-preferences -x -d (N_ "Set the list of personal compression preferences to the specified string")
-complete -c gpg -l default-preference-list -x -d (N_ "Set the list of default preferences to the specified string")
+complete -c gpg -l personal-cipher-preferences -x --description "Set the list of personal cipher preferences to the specified string"
+complete -c gpg -l personal-digest-preferences -x --description "Set the list of personal digest preferences to the specified string"
+complete -c gpg -l personal-compress-preferences -x --description "Set the list of personal compression preferences to the specified string"
+complete -c gpg -l default-preference-list -x --description "Set the list of default preferences to the specified string"
diff --git a/share/completions/gprof.fish b/share/completions/gprof.fish
index 1d621a25..cbccb628 100644
--- a/share/completions/gprof.fish
+++ b/share/completions/gprof.fish
@@ -1,34 +1,34 @@
-complete -c gprof -s A -l annoted-source -d (N_ "Print annotated source")
-complete -c gprof -s b -l brief -d (N_ "Do not print explanations")
-complete -c gprof -s C -l exec-counts -d (N_ "Print tally")
-complete -c gprof -s i -l file-info -d (N_ "Display summary")
-complete -c gprof -s I -l directory-path -d (N_ "Search directories for source")
-complete -c gprof -s J -l no-annotated-source -d (N_ "No annotated source")
-complete -c gprof -s L -l print-path -d (N_ "Print full path of source")
-complete -c gprof -s p -l flat-profile -d (N_ "Print flat profile")
-complete -c gprof -s P -l no-flat-profile -d (N_ "No flat profile")
-complete -c gprof -s q -l graph -d (N_ "Print call graph")
-complete -c gprof -s Q -l no-graph -d (N_ "No call graph")
-complete -c gprof -s y -l separate-files -d (N_ "Annotate to file")
-complete -c gprof -s Z -l no-exec-counts -d (N_ "No tally")
-complete -c gprof -l function-ordering -d (N_ "Suggest function ordering")
-complete -rc gprof -l file-ordering -d (N_ "Suggest file ordering")
-complete -c gprof -s T -l traditional -d (N_ "Traditional mode")
-complete -xc gprof -s w -l width -d (N_ "Set width of output")
-complete -c gprof -s x -l all-lines -d (N_ "Annotate every line")
-complete -xc gprof -l demangle -d (N_ "Set demangling style")
-complete -c gprof -l no-demangle -d (N_ "Turn of demangling")
-complete -xc gprof -s a -l no-static -d (N_ "Supress static functions")
+complete -c gprof -s A -l annoted-source --description "Print annotated source"
+complete -c gprof -s b -l brief --description "Do not print explanations"
+complete -c gprof -s C -l exec-counts --description "Print tally"
+complete -c gprof -s i -l file-info --description "Display summary"
+complete -c gprof -s I -l directory-path --description "Search directories for source"
+complete -c gprof -s J -l no-annotated-source --description "No annotated source"
+complete -c gprof -s L -l print-path --description "Print full path of source"
+complete -c gprof -s p -l flat-profile --description "Print flat profile"
+complete -c gprof -s P -l no-flat-profile --description "No flat profile"
+complete -c gprof -s q -l graph --description "Print call graph"
+complete -c gprof -s Q -l no-graph --description "No call graph"
+complete -c gprof -s y -l separate-files --description "Annotate to file"
+complete -c gprof -s Z -l no-exec-counts --description "No tally"
+complete -c gprof -l function-ordering --description "Suggest function ordering"
+complete -rc gprof -l file-ordering --description "Suggest file ordering"
+complete -c gprof -s T -l traditional --description "Traditional mode"
+complete -xc gprof -s w -l width --description "Set width of output"
+complete -c gprof -s x -l all-lines --description "Annotate every line"
+complete -xc gprof -l demangle --description "Set demangling style"
+complete -c gprof -l no-demangle --description "Turn of demangling"
+complete -xc gprof -s a -l no-static --description "Supress static functions"
complete -xc gprof -s c -l static-call-graph
-complete -xc gprof -s D -l ignore-non-functions -d (N_ "Ignore symbols not known to be functions")
-complete -xc gprof -s k -r -d (N_ "Delete arcs from callgraph")
-complete -xc gprof -s l -l line -d (N_ "Line by line profiling")
-complete -xc gprof -s m -l min-count -r -d (N_ "Supress output when executed less than specified times")
-complete -xc gprof -s n -l time -d (N_ "Only propagate times for matching symbols")
-complete -xc gprof -s N -l no-time -d (N_ "Do not propagate times for matching symbols")
-complete -xc gprof -s z -l display-unused-functions -d (N_ "Mention unused functions in flat profile")
-complete -xc gprof -s d -l debug -d (N_ "Specify debugging options")
-complete -xc gprof -s h -l help -d (N_ "Display help and exit")
-complete -xc gprof -s v -l version -d (N_ "Display version and exit")
-complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" -d (N_ "Profile data format")
-complete -xc gprof -s s -l sum -d (N_ "Print summary")
+complete -xc gprof -s D -l ignore-non-functions --description "Ignore symbols not known to be functions"
+complete -xc gprof -s k -r --description "Delete arcs from callgraph"
+complete -xc gprof -s l -l line --description "Line by line profiling"
+complete -xc gprof -s m -l min-count -r --description "Supress output when executed less than specified times"
+complete -xc gprof -s n -l time --description "Only propagate times for matching symbols"
+complete -xc gprof -s N -l no-time --description "Do not propagate times for matching symbols"
+complete -xc gprof -s z -l display-unused-functions --description "Mention unused functions in flat profile"
+complete -xc gprof -s d -l debug --description "Specify debugging options"
+complete -xc gprof -s h -l help --description "Display help and exit"
+complete -xc gprof -s v -l version --description "Display version and exit"
+complete -xc gprof -s O -l file-format -x -a "auto bsd 4.4bsd magic prof" --description "Profile data format"
+complete -xc gprof -s s -l sum --description "Print summary"
diff --git a/share/completions/grep.fish b/share/completions/grep.fish
index 5d16c847..0a256105 100644
--- a/share/completions/grep.fish
+++ b/share/completions/grep.fish
@@ -2,49 +2,49 @@
# Completions for the grep command
#
-complete -c grep -s A -l after-context -d (N_ "Print NUM lines of trailing context")
-complete -c grep -s a -l text -d (N_ "Process binary file as text")
-complete -c grep -s B -l before-context -d (N_ "Print NUM lines of leading context")
-complete -c grep -s C -l context -d (N_ "Print NUM lines of context")
-complete -c grep -s b -l byte-offset -d (N_ "Print byte offset of matches")
-complete -c grep -l binary-files -d (N_ "Assume data type for binary files") -x -a "binary text"
+complete -c grep -s A -l after-context --description "Print NUM lines of trailing context"
+complete -c grep -s a -l text --description "Process binary file as text"
+complete -c grep -s B -l before-context --description "Print NUM lines of leading context"
+complete -c grep -s C -l context --description "Print NUM lines of context"
+complete -c grep -s b -l byte-offset --description "Print byte offset of matches"
+complete -c grep -l binary-files --description "Assume data type for binary files" -x -a "binary text"
complete -c grep -l colour -x -a "never always auto"
complete -c grep -l color -x -a "never always auto"
-complete -c grep -s c -l count -d (N_ "Only print number of matches")
-complete -c grep -s D -l devices -x -a "read skip" -d (N_ "Action for devices")
-complete -c grep -s d -l directories -x -a "read skip recurse" -d (N_ "Action for directories")
-complete -c grep -s E -l extended-regexp -d (N_ "Pattern is extended regexp")
-complete -xc grep -s e -l regexp -d (N_ "Pattern is a regexp")
-complete -c grep -s F -l fixed -d (N_ "Pattern is a fixed string")
-complete -c grep -s f -l file -r -d (N_ "Use pattern from file")
-complete -c grep -s G -l basic-regexp -d (N_ "Pattern is basic regex")
-complete -c grep -s H -l with-filename -d (N_ "Print filename")
-complete -c grep -s h -l no-filename -d (N_ "Supress printing filename")
-complete -c grep -l help -d (N_ "Display help and exit")
-complete -c grep -s I -d (N_ "Skip binary files")
-complete -c grep -s i -l ignore-case -d (N_ "Ignore case")
-complete -c grep -s L -l files-without-match -d (N_ "Print first non-matching file")
-complete -c grep -s l -l files-with-match -d (N_ "Print first matching file")
-complete -c grep -s m -l max-count -d (N_ "Stop reading after NUM matches")
-complete -c grep -l mmap -d (N_ "Use the mmap system call to read input")
-complete -c grep -s n -l line-number -d (N_ "Print linenumber")
-complete -c grep -s o -l only-matching -d (N_ "Show only matching part")
-complete -c grep -l label -d (N_ "Rename stdin")
-complete -c grep -l line-buffered -d (N_ "Use line buffering")
-complete -c grep -s q -l quiet -d (N_ "Do not write anything")
-complete -c grep -l silent -d (N_ "Do not write anything")
-complete -c grep -s R -l recursive -d (N_ "Read files under each directory")
-complete -c grep -s r -d (N_ "Read files under each directory")
-complete -c grep -l include -d (N_ "Recurse, search file matching PATTERN")
-complete -c grep -l exclude -d (N_ "Recurse, skip file matching PATTERN")
-complete -c grep -s s -l no-messages -d (N_ "Suppress error messages")
-complete -c grep -s U -l binary -d (N_ "Treat files as binary")
-complete -c grep -s u -l unix-byte-offsets -d (N_ "Report Unix-style byte offsets")
-complete -c grep -s V -l version -d (N_ "Display version and exit")
-complete -c grep -s v -l invert-match -d (N_ "Invert the sense of matching")
-complete -c grep -s w -l word-regexp -d (N_ "Only whole matching words")
-complete -c grep -s x -l line-regexp -d (N_ "Only whole matching lines")
-complete -c grep -s y -d (N_ "Synonym for -i")
-complete -c grep -s Z -l null -d (N_ "Output a zero byte after filename")
+complete -c grep -s c -l count --description "Only print number of matches"
+complete -c grep -s D -l devices -x -a "read skip" --description "Action for devices"
+complete -c grep -s d -l directories -x -a "read skip recurse" --description "Action for directories"
+complete -c grep -s E -l extended-regexp --description "Pattern is extended regexp"
+complete -xc grep -s e -l regexp --description "Pattern is a regexp"
+complete -c grep -s F -l fixed --description "Pattern is a fixed string"
+complete -c grep -s f -l file -r --description "Use pattern from file"
+complete -c grep -s G -l basic-regexp --description "Pattern is basic regex"
+complete -c grep -s H -l with-filename --description "Print filename"
+complete -c grep -s h -l no-filename --description "Supress printing filename"
+complete -c grep -l help --description "Display help and exit"
+complete -c grep -s I --description "Skip binary files"
+complete -c grep -s i -l ignore-case --description "Ignore case"
+complete -c grep -s L -l files-without-match --description "Print first non-matching file"
+complete -c grep -s l -l files-with-match --description "Print first matching file"
+complete -c grep -s m -l max-count --description "Stop reading after NUM matches"
+complete -c grep -l mmap --description "Use the mmap system call to read input"
+complete -c grep -s n -l line-number --description "Print linenumber"
+complete -c grep -s o -l only-matching --description "Show only matching part"
+complete -c grep -l label --description "Rename stdin"
+complete -c grep -l line-buffered --description "Use line buffering"
+complete -c grep -s q -l quiet --description "Do not write anything"
+complete -c grep -l silent --description "Do not write anything"
+complete -c grep -s R -l recursive --description "Read files under each directory"
+complete -c grep -s r --description "Read files under each directory"
+complete -c grep -l include --description "Recurse, search file matching PATTERN"
+complete -c grep -l exclude --description "Recurse, skip file matching PATTERN"
+complete -c grep -s s -l no-messages --description "Suppress error messages"
+complete -c grep -s U -l binary --description "Treat files as binary"
+complete -c grep -s u -l unix-byte-offsets --description "Report Unix-style byte offsets"
+complete -c grep -s V -l version --description "Display version and exit"
+complete -c grep -s v -l invert-match --description "Invert the sense of matching"
+complete -c grep -s w -l word-regexp --description "Only whole matching words"
+complete -c grep -s x -l line-regexp --description "Only whole matching lines"
+complete -c grep -s y --description "Synonym for -i"
+complete -c grep -s Z -l null --description "Output a zero byte after filename"
diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish
index 6260f008..9e776fba 100644
--- a/share/completions/gunzip.fish
+++ b/share/completions/gunzip.fish
@@ -1,21 +1,21 @@
-complete -c gunzip -s c -l stdout -d (N_ "Compress to stdout")
+complete -c gunzip -s c -l stdout --description "Compress to stdout"
complete -c gunzip -x -a "(
__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
__fish_complete_suffix (commandline -ct) .tgz 'Compressed archive'
)
"
-complete -c gunzip -s f -l force -d (N_ "Overwrite")
-complete -c gunzip -s h -l help -d (N_ "Display help and exit")
-complete -c gunzip -s l -l list -d (N_ "List compression information")
-complete -c gunzip -s L -l license -d (N_ "Print license")
-complete -c gunzip -s n -l no-name -d (N_ "Do not save/restore filename")
-complete -c gunzip -s N -l name -d (N_ "Save/restore filename")
-complete -c gunzip -s q -l quiet -d (N_ "Supress warnings")
-complete -c gunzip -s r -l recursive -d (N_ "Recurse directories")
-complete -c gunzip -s S -l suffix -r -d (N_ "Suffix")
-complete -c gunzip -s t -l test -d (N_ "Check integrity")
-complete -c gunzip -s v -l verbose -d (N_ "Display compression ratios")
-complete -c gunzip -s V -l version -d (N_ "Display version and exit")
+complete -c gunzip -s f -l force --description "Overwrite"
+complete -c gunzip -s h -l help --description "Display help and exit"
+complete -c gunzip -s l -l list --description "List compression information"
+complete -c gunzip -s L -l license --description "Print license"
+complete -c gunzip -s n -l no-name --description "Do not save/restore filename"
+complete -c gunzip -s N -l name --description "Save/restore filename"
+complete -c gunzip -s q -l quiet --description "Supress warnings"
+complete -c gunzip -s r -l recursive --description "Recurse directories"
+complete -c gunzip -s S -l suffix -r --description "Suffix"
+complete -c gunzip -s t -l test --description "Check integrity"
+complete -c gunzip -s v -l verbose --description "Display compression ratios"
+complete -c gunzip -s V -l version --description "Display version and exit"
complete -c gunzip -x -a "(
__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish
index 210ab6b4..c814f33d 100644
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -1,4 +1,4 @@
-complete -c gzip -s c -l stdout -d (N_ "Compress to stdout")
+complete -c gzip -s c -l stdout --description "Compress to stdout"
complete -c gzip -s d -l decompress -x -a "
(
__fish_complete_suffix (commandline -ct) .gz 'Compressed file'
@@ -6,18 +6,18 @@ complete -c gzip -s d -l decompress -x -a "
)
"
-complete -c gzip -s f -l force -d (N_ "Overwrite")
-complete -c gzip -s h -l help -d (N_ "Display help and exit")
-complete -c gzip -s l -l list -d (N_ "List compression information")
-complete -c gzip -s L -l license -d (N_ "Print license")
-complete -c gzip -s n -l no-name -d (N_ "Do not save/restore filename")
-complete -c gzip -s N -l name -d (N_ "Save/restore filename")
-complete -c gzip -s q -l quiet -d (N_ "Supress warnings")
-complete -c gzip -s r -l recursive -d (N_ "Recurse directories")
-complete -c gzip -s S -l suffix -r -d (N_ "Suffix")
-complete -c gzip -s t -l test -d (N_ "Check integrity")
-complete -c gzip -s v -l verbose -d (N_ "Display compression ratios")
-complete -c gzip -s V -l version -d (N_ "Display version and exit")
-complete -c gzip -s 1 -l fast -d (N_ "Use fast setting")
-complete -c gzip -s 9 -l best -d (N_ "Use high compression setting")
+complete -c gzip -s f -l force --description "Overwrite"
+complete -c gzip -s h -l help --description "Display help and exit"
+complete -c gzip -s l -l list --description "List compression information"
+complete -c gzip -s L -l license --description "Print license"
+complete -c gzip -s n -l no-name --description "Do not save/restore filename"
+complete -c gzip -s N -l name --description "Save/restore filename"
+complete -c gzip -s q -l quiet --description "Supress warnings"
+complete -c gzip -s r -l recursive --description "Recurse directories"
+complete -c gzip -s S -l suffix -r --description "Suffix"
+complete -c gzip -s t -l test --description "Check integrity"
+complete -c gzip -s v -l verbose --description "Display compression ratios"
+complete -c gzip -s V -l version --description "Display version and exit"
+complete -c gzip -s 1 -l fast --description "Use fast setting"
+complete -c gzip -s 9 -l best --description "Use high compression setting"
diff --git a/share/completions/help.fish b/share/completions/help.fish
index cf0ecfa8..770c88ed 100644
--- a/share/completions/help.fish
+++ b/share/completions/help.fish
@@ -3,7 +3,7 @@
#
for i in case (sed -n < $__fish_help_dir/commands.html -e "s/.*<h2><a class=\"anchor\" name=\"\([^\"]*\)\">.*/\1/p")
- complete -c help -x -a $i -d (N_ "Help for the specified command")
+ complete -c help -x -a $i --description "Help for the specified command"
end
complete -c help -x -a syntax -d (N_ "Introduction to the fish syntax" )
@@ -11,22 +11,22 @@ complete -c help -x -a todo -d (N_ "Incomplete aspects of fish" )
complete -c help -x -a bugs -d (N_ "Known fish bugs" )
complete -c help -x -a history -d (N_ "Help on how to reuse previously entered commands" )
-complete -c help -x -a completion -d (N_ "Help on how tab-completion works")
-complete -c help -x -a job-control -d (N_ "Help on how job control works")
-complete -c help -x -a difference -d (N_ "Summary on how fish differs from other shells")
+complete -c help -x -a completion --description "Help on how tab-completion works"
+complete -c help -x -a job-control --description "Help on how job control works"
+complete -c help -x -a difference --description "Summary on how fish differs from other shells"
-complete -c help -x -a prompt -d (N_ "Help on how to set the prompt")
-complete -c help -x -a title -d (N_ "Help on how to set the titlebar message")
-complete -c help -x -a killring -d (N_ "Help on how to copy and paste")
-complete -c help -x -a editor -d (N_ "Help on editor shortcuts")
-complete -c help -x -a variables -d (N_ "Help on environment variables")
-complete -c help -x -a color -d (N_ "Help on setting syntax highlighting colors")
+complete -c help -x -a prompt --description "Help on how to set the prompt"
+complete -c help -x -a title --description "Help on how to set the titlebar message"
+complete -c help -x -a killring --description "Help on how to copy and paste"
+complete -c help -x -a editor --description "Help on editor shortcuts"
+complete -c help -x -a variables --description "Help on environment variables"
+complete -c help -x -a color --description "Help on setting syntax highlighting colors"
-complete -c help -x -a globbing -d (N_ "Help on parameter expansion (Globbing)")
-complete -c help -x -a expand -d (N_ "Help on parameter expansion (Globbing)")
-complete -c help -x -a expand-variable -d (N_ "Help on variable expansion \$VARNAME")
-complete -c help -x -a expand-home -d (N_ "Help on home directory expansion ~USER")
-complete -c help -x -a expand-brace -d (N_ "Help on brace expansion {a,b,c}")
-complete -c help -x -a expand-wildcard -d (N_ "Help on wildcard expansion *.*")
-complete -c help -x -a expand-command-substitution -d (N_ "Help on command substitution (SUBCOMMAND)")
-complete -c help -x -a expand-process -d (N_ "Help on process expansion %JOB")
+complete -c help -x -a globbing --description "Help on parameter expansion (Globbing)"
+complete -c help -x -a expand --description "Help on parameter expansion (Globbing)"
+complete -c help -x -a expand-variable --description "Help on variable expansion \$VARNAME"
+complete -c help -x -a expand-home --description "Help on home directory expansion ~USER"
+complete -c help -x -a expand-brace --description "Help on brace expansion {a,b,c}"
+complete -c help -x -a expand-wildcard --description "Help on wildcard expansion *.*"
+complete -c help -x -a expand-command-substitution --description "Help on command substitution (SUBCOMMAND)"
+complete -c help -x -a expand-process --description "Help on process expansion %JOB"
diff --git a/share/completions/iconv.fish b/share/completions/iconv.fish
index d1b57932..68eea1fa 100644
--- a/share/completions/iconv.fish
+++ b/share/completions/iconv.fish
@@ -1,10 +1,10 @@
-complete -c iconv -s f -l from-code -d (N_ "Convert from specified encoding") -x -a "(iconv --list|sed -e 's|//||')"
-complete -c iconv -s t -l to-code -d (N_ "Convert to specified encoding") -x -a "(iconv --list|sed -e 's|//||')"
-complete -c iconv -l list -d (N_ "List known coded character sets")
-complete -c iconv -s o -l output -d (N_ "Output file") -r
-complete -c iconv -l verbose -d (N_ "Print progress information")
-complete -c iconv -l help -d (N_ "Display version and exit")
-complete -c iconv -l version -d (N_ "Display help and exit")
+complete -c iconv -s f -l from-code --description "Convert from specified encoding" -x -a "(iconv --list|sed -e 's|//||')"
+complete -c iconv -s t -l to-code --description "Convert to specified encoding" -x -a "(iconv --list|sed -e 's|//||')"
+complete -c iconv -l list --description "List known coded character sets"
+complete -c iconv -s o -l output --description "Output file" -r
+complete -c iconv -l verbose --description "Print progress information"
+complete -c iconv -l help --description "Display version and exit"
+complete -c iconv -l version --description "Display help and exit"
diff --git a/share/completions/id.fish b/share/completions/id.fish
index 8b56bb1c..795a6d28 100644
--- a/share/completions/id.fish
+++ b/share/completions/id.fish
@@ -1,8 +1,8 @@
-complete -c id -s g -l group -d (N_ "Print effective group id")
-complete -c id -s G -l groups -d (N_ "Print all group ids")
-complete -c id -s n -l name -d (N_ "Print name, not number")
-complete -c id -s r -l real -d (N_ "Print real ID, not effective")
-complete -c id -s u -l user -d (N_ "Print effective user ID")
-complete -c id -l help -d (N_ "Display help and exit")
-complete -c id -l version -d (N_ "Display version and exit")
+complete -c id -s g -l group --description "Print effective group id"
+complete -c id -s G -l groups --description "Print all group ids"
+complete -c id -s n -l name --description "Print name, not number"
+complete -c id -s r -l real --description "Print real ID, not effective"
+complete -c id -s u -l user --description "Print effective user ID"
+complete -c id -l help --description "Display help and exit"
+complete -c id -l version --description "Display version and exit"
diff --git a/share/completions/ifconfig.fish b/share/completions/ifconfig.fish
index 35cc24a8..7639d96e 100644
--- a/share/completions/ifconfig.fish
+++ b/share/completions/ifconfig.fish
@@ -1,5 +1,5 @@
-complete -x -c ifconfig -a down -d (N_ "Stop interface")
-complete -x -c ifconfig -a up -d (N_ "Start interface")
+complete -x -c ifconfig -a down --description "Stop interface"
+complete -x -c ifconfig -a up --description "Start interface"
complete -x -c ifconfig -a "
{,-}arp
{,-}promisc
@@ -22,4 +22,4 @@ complete -x -c ifconfig -a "
address
txqueuelen
"
-complete -x -c ifconfig -a "(__fish_print_interfaces)" -d (N_ "Network interface")
+complete -x -c ifconfig -a "(__fish_print_interfaces)" --description "Network interface"
diff --git a/share/completions/jobs.fish b/share/completions/jobs.fish
index 8b4039d9..64bf19fd 100644
--- a/share/completions/jobs.fish
+++ b/share/completions/jobs.fish
@@ -1,7 +1,7 @@
complete -c jobs -s h -l help -d (N_ "Display help and exit" )
-complete -c jobs -s p -l pid -d (N_ "Show the process id of each process in the job")
-complete -c jobs -s g -l group -d (N_ "Show group id of job")
-complete -c jobs -s c -l command -d (N_ "Show commandname of each job")
-complete -c jobs -s l -l last -d (N_ "Only show status for last job to be started")
+complete -c jobs -s p -l pid --description "Show the process id of each process in the job"
+complete -c jobs -s g -l group --description "Show group id of job"
+complete -c jobs -s c -l command --description "Show commandname of each job"
+complete -c jobs -s l -l last --description "Only show status for last job to be started"
diff --git a/share/completions/kill.fish b/share/completions/kill.fish
index d7842791..c85d983c 100644
--- a/share/completions/kill.fish
+++ b/share/completions/kill.fish
@@ -7,7 +7,7 @@ if kill -L ^/dev/null >/dev/null
# Debian and some related systems use 'kill -L' to write out a numbered list
# of signals. Use this to complete on both number _and_ on signal name.
- complete -c kill -s L -d (N_ "List codes and names of available signals")
+ complete -c kill -s L --description "List codes and names of available signals"
set signals (kill -L | sed -e 's/\([0-9][0-9]*\) *\([A-Z,0-9][A-Z,0-9]*\)/\1 \2\n/g;s/ +/ /g' | sed -e 's/^ //' | sgrep -E '^[^ ]+')
@@ -16,7 +16,7 @@ else
# Posix systems print out the name of a signal using 'kill -l
# SIGNUM', so we use this instead.
- complete -c kill -s l -d (N_ "List names of available signals")
+ complete -c kill -s l --description "List names of available signals"
for i in (seq 31)
set signals $signals $i" "(kill -l $i)
diff --git a/share/completions/less.fish b/share/completions/less.fish
index 969e4838..923bc948 100644
--- a/share/completions/less.fish
+++ b/share/completions/less.fish
@@ -1,52 +1,52 @@
-complete -c less -s \? -l help -d (N_ "Display help and exit")
-complete -c less -s a -l search-skip-screen -d (N_ "Search after end of screen")
-complete -c less -s b -l buffers -r -d (N_ "Buffer space")
-complete -c less -s B -l auto-buffers -d (N_ "Disable automtic buffer allocation")
-complete -c less -s c -l clear-screen -d (N_ "Repaint from top")
-complete -c less -s C -l CLEAR-SCREEN -d (N_ "Clear and repaint from top")
-complete -c less -s d -l dumb -d (N_ "Supress error for lacking terminal capability")
-complete -c less -s e -l quit-at-eof -d (N_ "Exit on second EOF")
-complete -c less -s E -l QUIT-AT-EOF -d (N_ "Exit on EOF")
-complete -c less -s f -l force -d (N_ "Open non-regular files")
-complete -c less -s F -l quit-if-one-screen -d (N_ "Quit if file shorter than one screen")
-complete -c less -s g -l hilite-search -d (N_ "Hilight one search target")
-complete -c less -s G -l HILITE-SEARCH -d (N_ "No search highlighting")
-complete -c less -s h -l max-back-scroll -d (N_ "Maximum backward scroll") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s i -l ignore-case -d (N_ "Search ignores lowercase case")
-complete -c less -s I -l IGNORE-CASE -d (N_ "Search ignores all case")
-complete -c less -s j -l jump-target -d (N_ "Target line") -r -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19"
-complete -c less -s J -l status-column -d (N_ "Display status column")
-complete -c less -s k -l lesskey-file -d (N_ "Specify key bindings file") -r
+complete -c less -s \? -l help --description "Display help and exit"
+complete -c less -s a -l search-skip-screen --description "Search after end of screen"
+complete -c less -s b -l buffers -r --description "Buffer space"
+complete -c less -s B -l auto-buffers --description "Disable automtic buffer allocation"
+complete -c less -s c -l clear-screen --description "Repaint from top"
+complete -c less -s C -l CLEAR-SCREEN --description "Clear and repaint from top"
+complete -c less -s d -l dumb --description "Supress error for lacking terminal capability"
+complete -c less -s e -l quit-at-eof --description "Exit on second EOF"
+complete -c less -s E -l QUIT-AT-EOF --description "Exit on EOF"
+complete -c less -s f -l force --description "Open non-regular files"
+complete -c less -s F -l quit-if-one-screen --description "Quit if file shorter than one screen"
+complete -c less -s g -l hilite-search --description "Hilight one search target"
+complete -c less -s G -l HILITE-SEARCH --description "No search highlighting"
+complete -c less -s h -l max-back-scroll --description "Maximum backward scroll" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s i -l ignore-case --description "Search ignores lowercase case"
+complete -c less -s I -l IGNORE-CASE --description "Search ignores all case"
+complete -c less -s j -l jump-target --description "Target line" -r -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19"
+complete -c less -s J -l status-column --description "Display status column"
+complete -c less -s k -l lesskey-file --description "Specify key bindings file" -r
complete -c less -s L -l no-lessopen -d 'Ignore $LESSOPEN'
-complete -c less -s m -l long-prompt -d (N_ "Prompt with percentage")
-complete -c less -s M -l LONG-PROMPT -d (N_ "Verbose prompt")
-complete -c less -s n -l line-numbers -d (N_ "Display line number")
-complete -c less -s N -l LINE-NUMBERS -d (N_ "Display line number for each line")
-complete -c less -s o -l log-file -d (N_ "Log input to file") -r
-complete -c less -s O -l LOG-FILE -d (N_ "Log to file, overwrite") -r
-complete -c less -s p -l pattern -d (N_ "Start at first occurrence of pattern") -r
-complete -c less -s P -l prompt -d (N_ "Prompt string") -r
-complete -c less -s q -l quiet -d (N_ "Silent mode")
-complete -c less -l silent -d (N_ "Silent mode")
-complete -c less -s Q -l QUIET -d (N_ "Completly silent mode")
-complete -c less -l SILENT -d (N_ "Completly silent mode")
-complete -c less -s r -l raw-control-chars -d (N_ "Display control chars")
-complete -c less -s R -l RAW-CONTROL-CHARS -d (N_ "Display control chars, guess screen appearance")
-complete -c less -s s -l squeeze-blank-lines -d (N_ "Multiple blank lines sqeezed")
-complete -c less -s S -l chop-long-lines -d (N_ "Do not fold long lines")
-complete -c less -s t -l tag -d (N_ "Edit tag") -r
-complete -c less -s T -l tag-file -d (N_ "Set tag file") -r
-complete -c less -s u -l underline-special -d (N_ "Allow backspace and carriage return")
-complete -c less -s U -l UNDERLINE-SPECIAL -d (N_ "Allow backspace, tab and carriage return")
-complete -c less -s V -l version -d (N_ "Display version and exit")
-complete -c less -s w -l hilite-unread -d (N_ "Highlight first unread line on new page")
-complete -c less -s W -l HILITE-UNREAD -d (N_ "Highlight first unread line on any movement")
-complete -c less -s x -l tabs -d (N_ "Set tab stops") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"
-complete -c less -s X -l no-init -d (N_ "No termcap init")
-complete -c less -l no-keypad -d (N_ "No keypad init")
-complete -c less -s y -l max-forw-scroll -d (N_ "Maximum forward scroll") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s z -l window -d (N_ "Max scroll window") -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-complete -c less -s \" -l quotes -d (N_ "Set quote char") -r
-complete -c less -s \~ -l tilde -d (N_ "Lines after EOF are blank")
-complete -c less -s \# -l shift -d (N_ "Characters to scroll on left/right arrows") -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s m -l long-prompt --description "Prompt with percentage"
+complete -c less -s M -l LONG-PROMPT --description "Verbose prompt"
+complete -c less -s n -l line-numbers --description "Display line number"
+complete -c less -s N -l LINE-NUMBERS --description "Display line number for each line"
+complete -c less -s o -l log-file --description "Log input to file" -r
+complete -c less -s O -l LOG-FILE --description "Log to file, overwrite" -r
+complete -c less -s p -l pattern --description "Start at first occurrence of pattern" -r
+complete -c less -s P -l prompt --description "Prompt string" -r
+complete -c less -s q -l quiet --description "Silent mode"
+complete -c less -l silent --description "Silent mode"
+complete -c less -s Q -l QUIET --description "Completly silent mode"
+complete -c less -l SILENT --description "Completly silent mode"
+complete -c less -s r -l raw-control-chars --description "Display control chars"
+complete -c less -s R -l RAW-CONTROL-CHARS --description "Display control chars, guess screen appearance"
+complete -c less -s s -l squeeze-blank-lines --description "Multiple blank lines sqeezed"
+complete -c less -s S -l chop-long-lines --description "Do not fold long lines"
+complete -c less -s t -l tag --description "Edit tag" -r
+complete -c less -s T -l tag-file --description "Set tag file" -r
+complete -c less -s u -l underline-special --description "Allow backspace and carriage return"
+complete -c less -s U -l UNDERLINE-SPECIAL --description "Allow backspace, tab and carriage return"
+complete -c less -s V -l version --description "Display version and exit"
+complete -c less -s w -l hilite-unread --description "Highlight first unread line on new page"
+complete -c less -s W -l HILITE-UNREAD --description "Highlight first unread line on any movement"
+complete -c less -s x -l tabs --description "Set tab stops" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"
+complete -c less -s X -l no-init --description "No termcap init"
+complete -c less -l no-keypad --description "No keypad init"
+complete -c less -s y -l max-forw-scroll --description "Maximum forward scroll" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s z -l window --description "Max scroll window" -r -a "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
+complete -c less -s \" -l quotes --description "Set quote char" -r
+complete -c less -s \~ -l tilde --description "Lines after EOF are blank"
+complete -c less -s \# -l shift --description "Characters to scroll on left/right arrows" -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
diff --git a/share/completions/locate.fish b/share/completions/locate.fish
index db4163f5..7e16ffd6 100644
--- a/share/completions/locate.fish
+++ b/share/completions/locate.fish
@@ -1,19 +1,19 @@
-complete -c locate -s b -l basename -d (N_ "Match only the base name against the specified patterns")
-complete -c locate -s c -l count -d (N_ "Instead of writing file names on standard output, write the number of matching entries only")
-complete -c locate -s d -l database -d (N_ "Replace the default database with specified path") -r
-complete -c locate -s e -l existing -d (N_ "Print only entries that refer to files existing at the time locate is run")
-complete -c locate -s L -l follow -d (N_ "Follow symlinks when checking for existing files")
-complete -c locate -s h -l help -d (N_ "Display help and exit")
-complete -c locate -s i -l ignore-case -d (N_ "Ignore case distinctions when matching patterns")
-complete -c locate -s l -s n -l limit -d (N_ "Exit successfully after finding specified number of entires") -r
-complete -c locate -s m -l mmap -d (N_ "Ignored")
-complete -c locate -s P -s H -l nofollow -d (N_ "Do not follow symlinks when checking for existing files")
-complete -c locate -s 0 -l null -d (N_ "Separate the entries on output using the ASCII NUL character instead of writing each entry on a separate line")
-complete -c locate -s S -l statistics -d (N_ "Write statistics about each read database to standard output")
-complete -c locate -s q -l quiet -d (N_ "Write no messages about errors encountered")
-complete -c locate -s r -l regexp -d (N_ "Search for specified basic regex") -r
-complete -c locate -l regex -d (N_ "Interpret all patterns as extended regexps")
-complete -c locate -s s -l stdio -d (N_ "Ignored")
-complete -c locate -s V -l version -d (N_ "Display version and exit")
-complete -c locate -s w -l wholename -d (N_ "Match only the whole path name against the specified patterns")
+complete -c locate -s b -l basename --description "Match only the base name against the specified patterns"
+complete -c locate -s c -l count --description "Instead of writing file names on standard output, write the number of matching entries only"
+complete -c locate -s d -l database --description "Replace the default database with specified path" -r
+complete -c locate -s e -l existing --description "Print only entries that refer to files existing at the time locate is run"
+complete -c locate -s L -l follow --description "Follow symlinks when checking for existing files"
+complete -c locate -s h -l help --description "Display help and exit"
+complete -c locate -s i -l ignore-case --description "Ignore case distinctions when matching patterns"
+complete -c locate -s l -s n -l limit --description "Exit successfully after finding specified number of entires" -r
+complete -c locate -s m -l mmap --description "Ignored"
+complete -c locate -s P -s H -l nofollow --description "Do not follow symlinks when checking for existing files"
+complete -c locate -s 0 -l null --description "Separate the entries on output using the ASCII NUL character instead of writing each entry on a separate line"
+complete -c locate -s S -l statistics --description "Write statistics about each read database to standard output"
+complete -c locate -s q -l quiet --description "Write no messages about errors encountered"
+complete -c locate -s r -l regexp --description "Search for specified basic regex" -r
+complete -c locate -l regex --description "Interpret all patterns as extended regexps"
+complete -c locate -s s -l stdio --description "Ignored"
+complete -c locate -s V -l version --description "Display version and exit"
+complete -c locate -s w -l wholename --description "Match only the whole path name against the specified patterns"
diff --git a/share/completions/make.fish b/share/completions/make.fish
index 66a97ca7..ee32172d 100644
--- a/share/completions/make.fish
+++ b/share/completions/make.fish
@@ -14,25 +14,25 @@ set -l is_assignment "commandline -ct|sgrep '..*='"
set -l complete_file_assignment '(commandline -ct)(complete --do-complete=this_command_does_not_exist\ (commandline -ct|sed -e \'s/.*=//\'))'
complete -c make --condition $is_assignment -a $complete_file_assignment
-complete -x -c make -a "(__fish_print_make_targets)" -d (N_ "Target")
-complete -r -c make -s f -d (N_ "Use file as makefile") -r
-complete -x -c make -s C -x -a "(__fish_complete_directories (commandline -ct))" -d (N_ "Change directory")
-complete -c make -s d -d (N_ "Debug mode")
-complete -c make -s e -d (N_ "Environment before makefile")
-complete -c make -s i -d (N_ "Ignore errors")
-complete -x -c make -s I -d (N_ "Search directory for makefile") -a "(__fish_complete_directories (commandline -ct))"
-complete -x -c make -s j -d (N_ "Number of concurrent jobs")
-complete -c make -s k -d (N_ "Continue after an error")
-complete -c make -s l -d (N_ "Start when load drops")
-complete -c make -s n -d (N_ "Do not execute commands")
-complete -c make -s o -r -d (N_ "Ignore specified file")
-complete -c make -s p -d (N_ "Print database")
-complete -c make -s q -d (N_ "Question mode")
-complete -c make -s r -d (N_ "Eliminate implicit rules")
-complete -c make -s s -d (N_ "Quiet mode")
-complete -c make -s S -d (N_ "Don't continue after an error")
-complete -c make -s t -d (N_ "Touch files, don't run commands")
-complete -c make -s v -d (N_ "Display version and exit")
-complete -c make -s w -d (N_ "Print working directory")
-complete -c make -s W -r -d (N_ "Pretend file is modified")
+complete -x -c make -a "(__fish_print_make_targets)" --description "Target"
+complete -r -c make -s f --description "Use file as makefile" -r
+complete -x -c make -s C -x -a "(__fish_complete_directories (commandline -ct))" --description "Change directory"
+complete -c make -s d --description "Debug mode"
+complete -c make -s e --description "Environment before makefile"
+complete -c make -s i --description "Ignore errors"
+complete -x -c make -s I --description "Search directory for makefile" -a "(__fish_complete_directories (commandline -ct))"
+complete -x -c make -s j --description "Number of concurrent jobs"
+complete -c make -s k --description "Continue after an error"
+complete -c make -s l --description "Start when load drops"
+complete -c make -s n --description "Do not execute commands"
+complete -c make -s o -r --description "Ignore specified file"
+complete -c make -s p --description "Print database"
+complete -c make -s q --description "Question mode"
+complete -c make -s r --description "Eliminate implicit rules"
+complete -c make -s s --description "Quiet mode"
+complete -c make -s S --description "Don't continue after an error"
+complete -c make -s t --description "Touch files, don't run commands"
+complete -c make -s v --description "Display version and exit"
+complete -c make -s w --description "Print working directory"
+complete -c make -s W -r --description "Pretend file is modified"
diff --git a/share/completions/makedepend.fish b/share/completions/makedepend.fish
index eceb2854..454c9185 100644
--- a/share/completions/makedepend.fish
+++ b/share/completions/makedepend.fish
@@ -1,13 +1,13 @@
-complete -c makedepend -s D -r -d (N_ "Define")
-complete -c makedepend -s I -r -d (N_ "Include directory")
-complete -c makedepend -s Y -r -d (N_ "Replace include directories")
-complete -c makedepend -s a -d (N_ "Append dependencies to makefile")
-complete -c makedepend -s f -r -d (N_ "Specify makefile")
-complete -c makedepend -o include -r -d (N_ "Prepend file to input")
-complete -c makedepend -s o -r -d (N_ "Object file suffix")
-complete -c makedepend -s p -r -d (N_ "Object file prefix")
-complete -c makedepend -s s -r -d (N_ "Starting string delimiter")
-complete -c makedepend -s w -r -d (N_ "Line width")
-complete -c makedepend -s v -d (N_ "Verbose mode")
-complete -c makedepend -s m -d (N_ "Warn about multiple inclusion")
+complete -c makedepend -s D -r --description "Define"
+complete -c makedepend -s I -r --description "Include directory"
+complete -c makedepend -s Y -r --description "Replace include directories"
+complete -c makedepend -s a --description "Append dependencies to makefile"
+complete -c makedepend -s f -r --description "Specify makefile"
+complete -c makedepend -o include -r --description "Prepend file to input"
+complete -c makedepend -s o -r --description "Object file suffix"
+complete -c makedepend -s p -r --description "Object file prefix"
+complete -c makedepend -s s -r --description "Starting string delimiter"
+complete -c makedepend -s w -r --description "Line width"
+complete -c makedepend -s v --description "Verbose mode"
+complete -c makedepend -s m --description "Warn about multiple inclusion"
diff --git a/share/completions/man.fish b/share/completions/man.fish
index 1e829958..38e5ca4d 100644
--- a/share/completions/man.fish
+++ b/share/completions/man.fish
@@ -1,36 +1,36 @@
complete -xc man -a "(__fish_complete_man)"
-complete -xc man -a 1 -d (N_ "Program section")
-complete -xc man -a 2 -d (N_ "Syscall section")
-complete -xc man -a 3 -d (N_ "Library section")
-complete -xc man -a 4 -d (N_ "Device section")
-complete -xc man -a 5 -d (N_ "File format section")
-complete -xc man -a 6 -d (N_ "Games section")
-complete -xc man -a 7 -d (N_ "Misc section")
-complete -xc man -a 8 -d (N_ "Admin section")
-complete -xc man -a 9 -d (N_ "Kernel section")
-complete -xc man -a tcl -d (N_ "Tcl section")
-complete -xc man -a n -d (N_ "New section")
-complete -xc man -a l -d (N_ "Local section")
+complete -xc man -a 1 --description "Program section"
+complete -xc man -a 2 --description "Syscall section"
+complete -xc man -a 3 --description "Library section"
+complete -xc man -a 4 --description "Device section"
+complete -xc man -a 5 --description "File format section"
+complete -xc man -a 6 --description "Games section"
+complete -xc man -a 7 --description "Misc section"
+complete -xc man -a 8 --description "Admin section"
+complete -xc man -a 9 --description "Kernel section"
+complete -xc man -a tcl --description "Tcl section"
+complete -xc man -a n --description "New section"
+complete -xc man -a l --description "Local section"
complete -xc man -a p
-complete -xc man -a o -d (N_ "Old section")
-complete -rc man -s C -d (N_ "Configuration file")
-complete -xc man -s M -a "(__fish_complete_directories (commandline -ct))" -d (N_ "Manpath")
-complete -rc man -s P -d (N_ "Pager")
-complete -xc man -s S -d (N_ "Manual sections")
-complete -c man -s a -d (N_ "Display all matches")
-complete -c man -s c -d (N_ "Always reformat")
-complete -c man -s d -d (N_ "Debug")
-complete -c man -s D -d (N_ "Debug and run")
-complete -c man -s f -d (N_ "Show whatis information")
-complete -c man -s F -l preformat -d (N_ "Format only")
-complete -c man -s h -d (N_ "Display help and exit")
-complete -c man -s k -d (N_ "Show apropos information")
-complete -c man -s K -d (N_ "Search in all man pages")
-complete -xc man -s m -d (N_ "Set system")
-complete -xc man -s p -d (N_ "Preprocessors")
-complete -c man -s t -d (N_ "Format for printing")
-complete -c man -s w -l path -d (N_ "Only print locations")
-complete -c man -s W -d (N_ "Only print locations")
+complete -xc man -a o --description "Old section"
+complete -rc man -s C --description "Configuration file"
+complete -xc man -s M -a "(__fish_complete_directories (commandline -ct))" --description "Manpath"
+complete -rc man -s P --description "Pager"
+complete -xc man -s S --description "Manual sections"
+complete -c man -s a --description "Display all matches"
+complete -c man -s c --description "Always reformat"
+complete -c man -s d --description "Debug"
+complete -c man -s D --description "Debug and run"
+complete -c man -s f --description "Show whatis information"
+complete -c man -s F -l preformat --description "Format only"
+complete -c man -s h --description "Display help and exit"
+complete -c man -s k --description "Show apropos information"
+complete -c man -s K --description "Search in all man pages"
+complete -xc man -s m --description "Set system"
+complete -xc man -s p --description "Preprocessors"
+complete -c man -s t --description "Format for printing"
+complete -c man -s w -l path --description "Only print locations"
+complete -c man -s W --description "Only print locations"
diff --git a/share/completions/mimedb.fish b/share/completions/mimedb.fish
index aca644eb..1aa1895a 100644
--- a/share/completions/mimedb.fish
+++ b/share/completions/mimedb.fish
@@ -1,9 +1,9 @@
-complete -c mimedb -s t -l input-file-data -d (N_ "Input is a file, use name and contents to determine mimetype")
-complete -c mimedb -s f -l input-filename -d (N_ "Input is a file, use name to determine mimetype")
-complete -c mimedb -s i -l input-mime -d (N_ "Input is a mimetype")
-complete -c mimedb -s m -l output-mime -d (N_ "Output mimetype")
-complete -c mimedb -s d -l output-description -d (N_ "Output description of mimetype")
-complete -c mimedb -s a -l output-action -d (N_ "Output default action for mimetype")
-complete -c mimedb -s l -l launch -d (N_ "Launch default action for each file")
-complete -c mimedb -s h -l help -d (N_ "Display help and exit")
-complete -c mimedb -s v -l version -d (N_ "Display version and exit")
+complete -c mimedb -s t -l input-file-data --description "Input is a file, use name and contents to determine mimetype"
+complete -c mimedb -s f -l input-filename --description "Input is a file, use name to determine mimetype"
+complete -c mimedb -s i -l input-mime --description "Input is a mimetype"
+complete -c mimedb -s m -l output-mime --description "Output mimetype"
+complete -c mimedb -s d -l output-description --description "Output description of mimetype"
+complete -c mimedb -s a -l output-action --description "Output default action for mimetype"
+complete -c mimedb -s l -l launch --description "Launch default action for each file"
+complete -c mimedb -s h -l help --description "Display help and exit"
+complete -c mimedb -s v -l version --description "Display version and exit"
diff --git a/share/completions/modprobe.fish b/share/completions/modprobe.fish
index 4abde544..e6625ab3 100644
--- a/share/completions/modprobe.fish
+++ b/share/completions/modprobe.fish
@@ -3,24 +3,24 @@
#
complete -c modprobe -d Module -a "(/sbin/modprobe -l | sed -e 's/\/.*\/\([^\/.]*\).*/\1/')"
-complete -c modprobe -s v -l verbose -d (N_ "Print messages about what the program is doing")
-complete -c modprobe -s C -l config -d (N_ "Configuration file") -r
-complete -c modprobe -s c -l showconfig -d (N_ "Dump configuration file")
-complete -c modprobe -s n -l dry-run -d (N_ "Do not actually insert/remove module")
-complete -c modprobe -s i -l ingnore-install -d (N_ "Ignore install and remove commands in configuration file")
-complete -c modprobe -l ingnore-remove -d (N_ "Ignore install and remove commands in configuration file")
-complete -c modprobe -s q -l quiet -d (N_ "Ignore bogus module names")
-complete -c modprobe -s r -l remove -d (N_ "Remove modules")
-complete -c modprobe -s V -l version -d (N_ "Display version and exit")
-complete -c modprobe -s f -l force -d (N_ "Ignore all version information")
-complete -c modprobe -l force-vermagic -d (N_ "Ignore version magic information")
-complete -c modprobe -l force-modversion -d (N_ "Ignore module interface version")
-complete -c modprobe -s l -l list -d (N_ "List all modules matching the given wildcard")
-complete -c modprobe -s a -l all -d (N_ "Insert modules matching the given wildcard")
-complete -c modprobe -s t -l type -d (N_ "Restrict wildcards to specified directory")
-complete -c modprobe -s s -l syslog -d (N_ "Send error messages through syslog")
-complete -c modprobe -l set-version -d (N_ "Specify kernel version")
-complete -c modprobe -l show-depends -d (N_ "List dependencies of module")
-complete -c modprobe -s o -l name -d (N_ "Rename module")
-complete -c modprobe -l first-time -d (N_ "Fail if inserting already loaded module")
+complete -c modprobe -s v -l verbose --description "Print messages about what the program is doing"
+complete -c modprobe -s C -l config --description "Configuration file" -r
+complete -c modprobe -s c -l showconfig --description "Dump configuration file"
+complete -c modprobe -s n -l dry-run --description "Do not actually insert/remove module"
+complete -c modprobe -s i -l ingnore-install --description "Ignore install and remove commands in configuration file"
+complete -c modprobe -l ingnore-remove --description "Ignore install and remove commands in configuration file"
+complete -c modprobe -s q -l quiet --description "Ignore bogus module names"
+complete -c modprobe -s r -l remove --description "Remove modules"
+complete -c modprobe -s V -l version --description "Display version and exit"
+complete -c modprobe -s f -l force --description "Ignore all version information"
+complete -c modprobe -l force-vermagic --description "Ignore version magic information"
+complete -c modprobe -l force-modversion --description "Ignore module interface version"
+complete -c modprobe -s l -l list --description "List all modules matching the given wildcard"
+complete -c modprobe -s a -l all --description "Insert modules matching the given wildcard"
+complete -c modprobe -s t -l type --description "Restrict wildcards to specified directory"
+complete -c modprobe -s s -l syslog --description "Send error messages through syslog"
+complete -c modprobe -l set-version --description "Specify kernel version"
+complete -c modprobe -l show-depends --description "List dependencies of module"
+complete -c modprobe -s o -l name --description "Rename module"
+complete -c modprobe -l first-time --description "Fail if inserting already loaded module"
diff --git a/share/completions/mount.fish b/share/completions/mount.fish
index 02960638..133c47cc 100644
--- a/share/completions/mount.fish
+++ b/share/completions/mount.fish
@@ -4,26 +4,26 @@
# including mount and df
# Completions for mount
-complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|sgrep "^/")' -d (N_ 'Mount point')
-complete -c mount -s V -d (N_ 'Display version and exit')
-complete -c mount -s h -d (N_ 'Display help and exit')
-complete -c mount -s v -d (N_ 'Verbose mode')
-complete -c mount -s a -d (N_ 'Mount filesystems in fstab')
-complete -c mount -s F -d (N_ 'Fork process for each mount')
-complete -c mount -s f -d (N_ 'Fake mounting')
-complete -c mount -s l -d (N_ 'Add label to output')
-complete -c mount -s n -d (N_ 'Do not write mtab')
-complete -c mount -s s -d (N_ 'Tolerate sloppy mount options')
-complete -c mount -s r -d (N_ 'Read only')
-complete -c mount -s w -d (N_ 'Read/Write mode')
-complete -x -c mount -s L -d (N_ 'Mount partition with specified label')
-complete -x -c mount -s U -d (N_ 'Mount partition with specified UID')
-complete -c mount -s O -x -d (N_ 'Exclude filesystems')
-complete -c mount -l bind -f -d (N_ 'Remount a subtree to a second position')
-complete -c mount -l move -f -d (N_ 'Move a subtree to a new position')
-complete -c mount -x -s t -d (N_ 'Filesystem') -a "(__fish_print_filesystems)"
+complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\).*/\1\n\2/"|sgrep "^/")' --description 'Mount point'
+complete -c mount -s V --description 'Display version and exit'
+complete -c mount -s h --description 'Display help and exit'
+complete -c mount -s v --description 'Verbose mode'
+complete -c mount -s a --description 'Mount filesystems in fstab'
+complete -c mount -s F --description 'Fork process for each mount'
+complete -c mount -s f --description 'Fake mounting'
+complete -c mount -s l --description 'Add label to output'
+complete -c mount -s n --description 'Do not write mtab'
+complete -c mount -s s --description 'Tolerate sloppy mount options'
+complete -c mount -s r --description 'Read only'
+complete -c mount -s w --description 'Read/Write mode'
+complete -x -c mount -s L --description 'Mount partition with specified label'
+complete -x -c mount -s U --description 'Mount partition with specified UID'
+complete -c mount -s O -x --description 'Exclude filesystems'
+complete -c mount -l bind -f --description 'Remount a subtree to a second position'
+complete -c mount -l move -f --description 'Move a subtree to a new position'
+complete -c mount -x -s t --description 'Filesystem' -a "(__fish_print_filesystems)"
-complete -c mount -x -s o -d (N_ 'Mount option') -a '(__fish_append , $__fish_mount_opts)'
+complete -c mount -x -s o --description 'Mount option' -a '(__fish_append , $__fish_mount_opts)'
set -g __fish_mount_opts async\tUse\ asynchronous\ I/O atime\tUpdate\ time\ on\ each\ access auto\tMounted\ with\ -a defaults\tUse\ default\ options dev\tInterpret\ character/block\ special\ devices exec\tPermit\ executables _netdev\tFilesystem\ uses\ network noatime\tDo\ not\ update\ time\ on\ each\ access noauto\tNot\ mounted\ by\ -a nodev\tDo\ not\ interpret\ character/block\ special\ devices noexec\tDo\ not\ permit\ executables nosuid\tIgnore\ suid\ bits nouser\tOnly\ root\ may\ mount remount\tRemount\ read-only\ filesystem ro\tMount\ read-only rw\tMount\ read-write suid\tAllow\ suid\ bits sync\tUse\ synchronous\ I/O dirsync\tUse\ synchronous\ directory\ operations user\tAny\ user\ may\ mount users\tAny\ user\ may\ mount\ and\ unmount
diff --git a/share/completions/mplayer.fish b/share/completions/mplayer.fish
index e6588ed2..cebdbbe0 100644
--- a/share/completions/mplayer.fish
+++ b/share/completions/mplayer.fish
@@ -24,62 +24,62 @@ set mplayer_lang "
se\Swedish
"
-complete -c mplayer -o autoq -d (N_ "Dynamically change postprocessing") -x
-complete -c mplayer -o autosync -x -d (N_ "A/V sync speed")
-complete -c mplayer -o framedrop -d (N_ "Skip frames to maintain A/V sync")
-complete -c mplayer -s h -o help -d (N_ "Display help and exit")
-complete -c mplayer -o hardframedrop -d (N_ "Skip frames to maintain A/V sync")
-complete -c mplayer -o loop -x -d (N_ "Loop playback") -r -a "0 1 2 3 4 5 6 7 8 9"
-complete -c mplayer -o shuffle -d (N_ "Play in random order")
+complete -c mplayer -o autoq --description "Dynamically change postprocessing" -x
+complete -c mplayer -o autosync -x --description "A/V sync speed"
+complete -c mplayer -o framedrop --description "Skip frames to maintain A/V sync"
+complete -c mplayer -s h -o help --description "Display help and exit"
+complete -c mplayer -o hardframedrop --description "Skip frames to maintain A/V sync"
+complete -c mplayer -o loop -x --description "Loop playback" -r -a "0 1 2 3 4 5 6 7 8 9"
+complete -c mplayer -o shuffle --description "Play in random order"
-complete -c mplayer -s h -o help -d (N_ "Display help and exit")
-complete -c mplayer -o fs -d (N_ "Full screen")
-complete -c mplayer -o playlist -d (N_ "Set playlist")-r
-complete -c mplayer -o alang -d (N_ "Audio language") -x -a $mplayer_lang
-complete -c mplayer -o audiofile -d (N_ "Play audio from file") -r
-complete -c mplayer -o cdrom-device -d (N_ "Set default CD-ROM drive")
-complete -c mplayer -o channels -d (N_ "Set number of audio channels") -x -a "2 4 6"
-complete -c mplayer -o chapter -d (N_ "Set start chapter") -x
-complete -c mplayer -o dvd-device -d (N_ "Set default DVD-ROM drive")
-complete -c mplayer -o dvdangle -d (N_ "Set dvd viewing angle") -x -a "1 2 3 4 5 6 7 8"
-complete -c mplayer -o forceidx -d (N_ "Force rebuilding index")
-complete -c mplayer -o fps -d (N_ "Override framerate") -x -a "24 25 30"
-complete -c mplayer -o idx -d (N_ "Build index if unavailable")
-complete -c mplayer -o loadidx -d (N_ "Load index from file") -r
-complete -c mplayer -o ni -d (N_ "Force non-interleaved AVI parser")
-complete -c mplayer -o saveidx -d (N_ "Rebuild index and save to file") -r
-complete -c mplayer -o ss -d (N_ "Seek to given time position") -x
-complete -c mplayer -o tv -d (N_ "TV capture mode")
-complete -c mplayer -o slang -d (N_ "Subtitle language") -x -a $mplayer_lang
-complete -c mplayer -o sub -d (N_ "Subtitle file") -r
-complete -c mplayer -o unicode -d (N_ "Handle subtitlefile as unicode")
-complete -c mplayer -o utf8 -d (N_ "Handle subtitlefile as utf8")
+complete -c mplayer -s h -o help --description "Display help and exit"
+complete -c mplayer -o fs --description "Full screen"
+complete -c mplayer -o playlist --description "Set playlist"-r
+complete -c mplayer -o alang --description "Audio language" -x -a $mplayer_lang
+complete -c mplayer -o audiofile --description "Play audio from file" -r
+complete -c mplayer -o cdrom-device --description "Set default CD-ROM drive"
+complete -c mplayer -o channels --description "Set number of audio channels" -x -a "2 4 6"
+complete -c mplayer -o chapter --description "Set start chapter" -x
+complete -c mplayer -o dvd-device --description "Set default DVD-ROM drive"
+complete -c mplayer -o dvdangle --description "Set dvd viewing angle" -x -a "1 2 3 4 5 6 7 8"
+complete -c mplayer -o forceidx --description "Force rebuilding index"
+complete -c mplayer -o fps --description "Override framerate" -x -a "24 25 30"
+complete -c mplayer -o idx --description "Build index if unavailable"
+complete -c mplayer -o loadidx --description "Load index from file" -r
+complete -c mplayer -o ni --description "Force non-interleaved AVI parser"
+complete -c mplayer -o saveidx --description "Rebuild index and save to file" -r
+complete -c mplayer -o ss --description "Seek to given time position" -x
+complete -c mplayer -o tv --description "TV capture mode"
+complete -c mplayer -o slang --description "Subtitle language" -x -a $mplayer_lang
+complete -c mplayer -o sub --description "Subtitle file" -r
+complete -c mplayer -o unicode --description "Handle subtitlefile as unicode"
+complete -c mplayer -o utf8 --description "Handle subtitlefile as utf8"
-complete -c mplayer -o vo -x -d (N_ "Video output") -a "
+complete -c mplayer -o vo -x --description "Video output" -a "
(
mplayer -vo help|sgrep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]* '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1'\t'\2/'
)
"
-complete -c mplayer -o ao -x -d (N_ "Audio output") -a "
+complete -c mplayer -o ao -x --description "Audio output" -a "
(
mplayer -ao help|sgrep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]* '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1'\t'\2/'
)
"
-complete -c mplayer -o afm -x -d (N_ "Audio output") -a "
+complete -c mplayer -o afm -x --description "Audio output" -a "
(
__fish_append ',' (mplayer -afm help|sgrep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]* '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1'\t'\2/')
)
"
-complete -c mplayer -o vfm -x -d (N_ "Video output") -a "
+complete -c mplayer -o vfm -x --description "Video output" -a "
(
__fish_append ',' (mplayer -vfm help|sgrep \t.\*\t'\|^ *[a-zA-Z0-9][a-zA-Z0-9]* '|sed -e 's/[\t ]*\([a-zA-Z0-9]*\)[\t ]*\(.*\)/\1'\t'\2/')
)
"
-complete -c mplayer -l help -d (N_ "Display help and exit")
-complete -c mplayer -l version -d (N_ "Display version and exit")
+complete -c mplayer -l help --description "Display help and exit"
+complete -c mplayer -l version --description "Display version and exit"
set -e mplayer_lang
diff --git a/share/completions/mv.fish b/share/completions/mv.fish
index 554f87a0..4afd5689 100644
--- a/share/completions/mv.fish
+++ b/share/completions/mv.fish
@@ -1,12 +1,12 @@
-complete -c mv -s b -l backup -d (N_ "Make backup of each existing destination file")
-complete -c mv -s f -l force -d (N_ "Do not prompt before overwriting")
-complete -c mv -s i -l interactive -d (N_ "Prompt before overwrite")
-complete -c mv -l reply -x -a "yes no query" -d (N_ "Answer for overwrite questions")
-complete -c mv -l strip-trailing-slashes -d (N_ "Remove trailing slashes from source")
-complete -c mv -s S -l suffix -r -d (N_ "Backup suffix")
-complete -c mv -l target-directory -d (N_ "Target directory") -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
-complete -c mv -s u -l update -d (N_ "Do not overwrite newer files")
-complete -c mv -s v -l verbose -d (N_ "Verbose mode")
-complete -c mv -l help -d (N_ "Display help and exit")
-complete -c mv -l version -d (N_ "Display version and exit")
+complete -c mv -s b -l backup --description "Make backup of each existing destination file"
+complete -c mv -s f -l force --description "Do not prompt before overwriting"
+complete -c mv -s i -l interactive --description "Prompt before overwrite"
+complete -c mv -l reply -x -a "yes no query" --description "Answer for overwrite questions"
+complete -c mv -l strip-trailing-slashes --description "Remove trailing slashes from source"
+complete -c mv -s S -l suffix -r --description "Backup suffix"
+complete -c mv -l target-directory --description "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
+complete -c mv -s u -l update --description "Do not overwrite newer files"
+complete -c mv -s v -l verbose --description "Verbose mode"
+complete -c mv -l help --description "Display help and exit"
+complete -c mv -l version --description "Display version and exit"
diff --git a/share/completions/nextd.fish b/share/completions/nextd.fish
index 18c5eb80..61324dd6 100644
--- a/share/completions/nextd.fish
+++ b/share/completions/nextd.fish
@@ -1 +1 @@
-complete -c nextd -s l -d (N_ "Also print directory history")
+complete -c nextd -s l --description "Also print directory history"
diff --git a/share/completions/nice.fish b/share/completions/nice.fish
index 0b6b69b7..72aecdb6 100644
--- a/share/completions/nice.fish
+++ b/share/completions/nice.fish
@@ -1,8 +1,8 @@
-complete -c nice -a "(__fish_complete_subcommand -- -n --adjustment)" -d (N_ "Command")
+complete -c nice -a "(__fish_complete_subcommand -- -n --adjustment)" --description "Command"
-complete -c nice -s n -l adjustment -n "__fish_no_arguments" -d (N_ "Add specified amount to niceness value") -x
-complete -c nice -l help -n "__fish_no_arguments" -d (N_ "Display help and exit")
-complete -c nice -l version -n "__fish_no_arguments" -d (N_ "Display version and exit")
+complete -c nice -s n -l adjustment -n "__fish_no_arguments" --description "Add specified amount to niceness value" -x
+complete -c nice -l help -n "__fish_no_arguments" --description "Display help and exit"
+complete -c nice -l version -n "__fish_no_arguments" --description "Display version and exit"
diff --git a/share/completions/patch.fish b/share/completions/patch.fish
index 668999e2..0bf5ab04 100644
--- a/share/completions/patch.fish
+++ b/share/completions/patch.fish
@@ -2,40 +2,40 @@
# Completions for patch
#
-complete -c patch -s b -l backup -d (N_ "Make backup files, when patching a file, rename or copy the original instead of removing it")
-complete -c patch -l backup-if-mismatch -d (N_ "Back up a file if the patch does not match the file exactly")
-complete -c patch -l no-backup-if-mismatch -d (N_ "Do not back up a file if the patch does not match the file exactly")
-complete -c patch -s B -l prefix -r -f -d (N_ "Prefix pref to a file name when generating its simple backup file name")
-complete -c patch -l binary -d (N_ "Read and write all files in binary mode")
-complete -c patch -s c -l context -d (N_ "Interpret the patch file as a ordinary context diff")
-complete -c patch -s d -l directory -r -f -d (N_ "Change to the directory dir immediately")
-complete -c patch -s D -l ifdef -r -f -d (N_ "Use the #ifdef ... #endif construct to mark changes")
-complete -c patch -l dry-run -d (N_ "Print the results of applying the patches without actually changing any files")
-complete -c patch -s e -l ed -d (N_ "Interpret the patch file as an ed script")
-complete -c patch -s E -l remove-empty-files -d (N_ "Remove output files that are empty after the patches have been applied")
-complete -c patch -s f -l force -d (N_ "Assume that the user knows exactly what he/she is doing, and do not ask questions")
-complete -c patch -s F -l fuzz -r -f -d (N_ "Set the maximum fuzz factor")
-complete -c patch -s g -l get -r -f -d (N_ "This option controls patch's actions when a file is under RCS or SCCS control, and does not exist or is read-only and matches the default version, or when a file is under ClearCase control and does not exist")
-complete -c patch -l help -d (N_ "Display help and exit")
-complete -c patch -s i -l input -r -f -d (N_ "Read the patch from patchfile")
-complete -c patch -s l -l ignore-whitespace -d (N_ "Match patterns loosely, in case tabs or spaces have been munged in your files")
-complete -c patch -s n -l normal -d (N_ "Interpret the patch file as a normal diff")
-complete -c patch -s N -l forward -d (N_ "Ignore patches that seem to be reversed or already applied")
-complete -c patch -s o -l output -r -f -d (N_ "Send output to outfile instead of patching files in place")
-complete -c patch -s p -l strip -r -f -d (N_ "Strip the smallest prefix containing num leading slashes from each file name found in the patch file")
-complete -c patch -l posix -d (N_ "Conform more strictly to the POSIX standard")
-complete -c patch -l quoting-style -r -f -d (N_ "Use style word to quote output names") -a "literal shell shell-always c escape"
-complete -c patch -s r -l reject-file -r -f -d (N_ "Put rejects into rejectfile instead of the default .rej file")
-complete -c patch -s R -l reverse -d (N_ "Assume that this patch was created with the old and new files swapped")
-complete -c patch -s s -l silent -l quiet -d (N_ "Work silently, unless an error occurs")
-complete -c patch -s t -l batch -d (N_ "Suppress questions like -f, but make some different assumptions")
-complete -c patch -s T -l set-time -d (N_ "Set the modification and access times of patched files from time stamps given in context diff headers, local time")
-complete -c patch -s u -l unified -d (N_ "Interpret the patch file as a unified context diff")
-complete -c patch -s v -l version -d (N_ "Display version and exit")
-complete -c patch -s V -l version-control -r -f -d (N_ "Use method to determine backup file names")
-complete -c patch -l verbose -d (N_ "Output extra information about the work being done")
-complete -c patch -s x -l debug -r -f -d (N_ "Set internal debugging flags of interest only to patch patchers")
-complete -c patch -s Y -l basename-prefix -r -f -d (N_ "Prefix pref to the basename of a file name when generating its simple backup file name")
-complete -c patch -s z -l suffix -r -f -d (N_ "Use suffix as the simple backup suffix")
-complete -c patch -s Z -l set-utc -d (N_ "Set the modification and access times of patched files from time stamps given in context diff headers, UTC, GMT")
+complete -c patch -s b -l backup --description "Make backup files, when patching a file, rename or copy the original instead of removing it"
+complete -c patch -l backup-if-mismatch --description "Back up a file if the patch does not match the file exactly"
+complete -c patch -l no-backup-if-mismatch --description "Do not back up a file if the patch does not match the file exactly"
+complete -c patch -s B -l prefix -r -f --description "Prefix pref to a file name when generating its simple backup file name"
+complete -c patch -l binary --description "Read and write all files in binary mode"
+complete -c patch -s c -l context --description "Interpret the patch file as a ordinary context diff"
+complete -c patch -s d -l directory -r -f --description "Change to the directory dir immediately"
+complete -c patch -s D -l ifdef -r -f --description "Use the #ifdef ... #endif construct to mark changes"
+complete -c patch -l dry-run --description "Print the results of applying the patches without actually changing any files"
+complete -c patch -s e -l ed --description "Interpret the patch file as an ed script"
+complete -c patch -s E -l remove-empty-files --description "Remove output files that are empty after the patches have been applied"
+complete -c patch -s f -l force --description "Assume that the user knows exactly what he/she is doing, and do not ask questions"
+complete -c patch -s F -l fuzz -r -f --description "Set the maximum fuzz factor"
+complete -c patch -s g -l get -r -f --description "This option controls patch's actions when a file is under RCS or SCCS control, and does not exist or is read-only and matches the default version, or when a file is under ClearCase control and does not exist"
+complete -c patch -l help --description "Display help and exit"
+complete -c patch -s i -l input -r -f --description "Read the patch from patchfile"
+complete -c patch -s l -l ignore-whitespace --description "Match patterns loosely, in case tabs or spaces have been munged in your files"
+complete -c patch -s n -l normal --description "Interpret the patch file as a normal diff"
+complete -c patch -s N -l forward --description "Ignore patches that seem to be reversed or already applied"
+complete -c patch -s o -l output -r -f --description "Send output to outfile instead of patching files in place"
+complete -c patch -s p -l strip -r -f --description "Strip the smallest prefix containing num leading slashes from each file name found in the patch file"
+complete -c patch -l posix --description "Conform more strictly to the POSIX standard"
+complete -c patch -l quoting-style -r -f --description "Use style word to quote output names" -a "literal shell shell-always c escape"
+complete -c patch -s r -l reject-file -r -f --description "Put rejects into rejectfile instead of the default .rej file"
+complete -c patch -s R -l reverse --description "Assume that this patch was created with the old and new files swapped"
+complete -c patch -s s -l silent -l quiet --description "Work silently, unless an error occurs"
+complete -c patch -s t -l batch --description "Suppress questions like -f, but make some different assumptions"
+complete -c patch -s T -l set-time --description "Set the modification and access times of patched files from time stamps given in context diff headers, local time"
+complete -c patch -s u -l unified --description "Interpret the patch file as a unified context diff"
+complete -c patch -s v -l version --description "Display version and exit"
+complete -c patch -s V -l version-control -r -f --description "Use method to determine backup file names"
+complete -c patch -l verbose --description "Output extra information about the work being done"
+complete -c patch -s x -l debug -r -f --description "Set internal debugging flags of interest only to patch patchers"
+complete -c patch -s Y -l basename-prefix -r -f --description "Prefix pref to the basename of a file name when generating its simple backup file name"
+complete -c patch -s z -l suffix -r -f --description "Use suffix as the simple backup suffix"
+complete -c patch -s Z -l set-utc --description "Set the modification and access times of patched files from time stamps given in context diff headers, UTC, GMT"
diff --git a/share/completions/perl.fish b/share/completions/perl.fish
index cc64fe36..79aff817 100644
--- a/share/completions/perl.fish
+++ b/share/completions/perl.fish
@@ -1,20 +1,20 @@
-complete -c perl -s 0 -d (N_ 'Specify record separator')
-complete -c perl -s a -d (N_ 'Turn on autosplit mode')
-complete -c perl -s c -d (N_ 'Check syntax')
-complete -c perl -s d -d (N_ 'Debugger')
-complete -c perl -s D -x -d (N_ 'Debug option')
-complete -c perl -s e -x -d (N_ 'Execute command')
-complete -c perl -s F -d (N_ 'Set regexp used to split input')
-complete -c perl -s i -d (N_ 'Edit files in-place')
-complete -c perl -s I -d (N_ 'Include path')
-complete -c perl -s l -d (N_ 'Automatic line ending processing')
-complete -c perl -s n -d (N_ 'Loop script')
-complete -c perl -s p -d (N_ 'Loop script, print $_')
-complete -c perl -s P -d (N_ 'Invoke CPP')
-complete -c perl -s s -d (N_ 'Define custom switches')
-complete -c perl -s S -d (N_ 'Search $PATH for script')
-complete -c perl -s T -d (N_ 'Taint checking')
-complete -c perl -s U -d (N_ 'Unsafe mode')
-complete -c perl -s v -d (N_ 'Display version and exit')
-complete -c perl -s x -d (N_ 'Extract script')
+complete -c perl -s 0 --description 'Specify record separator'
+complete -c perl -s a --description 'Turn on autosplit mode'
+complete -c perl -s c --description 'Check syntax'
+complete -c perl -s d --description 'Debugger'
+complete -c perl -s D -x --description 'Debug option'
+complete -c perl -s e -x --description 'Execute command'
+complete -c perl -s F --description 'Set regexp used to split input'
+complete -c perl -s i --description 'Edit files in-place'
+complete -c perl -s I --description 'Include path'
+complete -c perl -s l --description 'Automatic line ending processing'
+complete -c perl -s n --description 'Loop script'
+complete -c perl -s p --description 'Loop script, print $_'
+complete -c perl -s P --description 'Invoke CPP'
+complete -c perl -s s --description 'Define custom switches'
+complete -c perl -s S --description 'Search $PATH for script'
+complete -c perl -s T --description 'Taint checking'
+complete -c perl -s U --description 'Unsafe mode'
+complete -c perl -s v --description 'Display version and exit'
+complete -c perl -s x --description 'Extract script'
diff --git a/share/completions/pine.fish b/share/completions/pine.fish
index 7405e34b..7664d377 100644
--- a/share/completions/pine.fish
+++ b/share/completions/pine.fish
@@ -1,19 +1,19 @@
-complete -c pine -s f -d (N_ "Open folder") -a "(cd ~/.Mail; ls -d *)"
-complete -c pine -s F -d (N_ "Open file") -r
-complete -c pine -s h -d (N_ "Display help and exit")
-complete -c pine -s i -d (N_ "Start in folder index")
-complete -c pine -s I -d (N_ "Initial set of keystrokes") -x
-complete -c pine -s k -d (N_ "Use function keys for commands")
-complete -c pine -s l -d (N_ "Expand collections in FOLDER LIST display")
-complete -c pine -s n -d (N_ "Start with specified current message number") -x
-complete -c pine -s o -d (N_ "Open folder read-only")
-complete -c pine -s p -d (N_ "Set configuration file") -r
-complete -c pine -s P -d (N_ "Set global configuration file")
-complete -c pine -s r -d (N_ "Restricted mode")
-complete -c pine -s z -d (N_ "Enable suspension support")
-complete -c pine -o conf -d (N_ "Produce a sample global configuration file")
-complete -c pine -o pinerc -d (N_ "Produce sample configuration file") -r
-complete -c pine -o sort -d (N_ "Set mail sort order") -a "
+complete -c pine -s f --description "Open folder" -a "(cd ~/.Mail; ls -d *)"
+complete -c pine -s F --description "Open file" -r
+complete -c pine -s h --description "Display help and exit"
+complete -c pine -s i --description "Start in folder index"
+complete -c pine -s I --description "Initial set of keystrokes" -x
+complete -c pine -s k --description "Use function keys for commands"
+complete -c pine -s l --description "Expand collections in FOLDER LIST display"
+complete -c pine -s n --description "Start with specified current message number" -x
+complete -c pine -s o --description "Open folder read-only"
+complete -c pine -s p --description "Set configuration file" -r
+complete -c pine -s P --description "Set global configuration file"
+complete -c pine -s r --description "Restricted mode"
+complete -c pine -s z --description "Enable suspension support"
+complete -c pine -o conf --description "Produce a sample global configuration file"
+complete -c pine -o pinerc --description "Produce sample configuration file" -r
+complete -c pine -o sort --description "Set mail sort order" -a "
arrival
subject
from
@@ -23,4 +23,4 @@ complete -c pine -o sort -d (N_ "Set mail sort order") -a "
reverse
"
-complete -c pine -o option -d (N_ "Config option") -x
+complete -c pine -o option --description "Config option" -x
diff --git a/share/completions/ping.fish b/share/completions/ping.fish
index a9f6b687..37ef21ac 100644
--- a/share/completions/ping.fish
+++ b/share/completions/ping.fish
@@ -1,30 +1,30 @@
complete -c ping -a "(__fish_print_hostnames)" -x
-complete -c ping -s a -d (N_ "Audible ping")
-complete -c ping -s A -d (N_ "Adaptive ping")
-complete -c ping -s b -d (N_ "Allow pinging a broadcast address")
-complete -c ping -s B -d (N_ "Do not allow ping to change source address of probes")
-complete -c ping -s c -d (N_ "Stop after specified number of ECHO_REQUEST packets") -x
-complete -c ping -s d -d (N_ "Set the SO_DEBUG option on the socket being used")
-complete -c ping -s F -d (N_ "Allocate and set 20 bit flow label on ECHO_REQUEST packets") -x
-complete -c ping -s f -d (N_ "Flood ping")
-complete -c ping -s i -d (N_ "Wait specified interval of seconds between sending each packet") -x
-complete -c ping -s I -d (N_ "Set source address to specified interface address") -x -a "(__fish_print_interfaces; fish_print_addresses)"
-complete -c ping -s l -d (N_ "Send the specified number of packets without waiting for reply") -x
-complete -c ping -s L -d (N_ "Suppress loopback of multicast packets")
-complete -c ping -s n -d (N_ "Numeric output only")
-complete -c ping -s p -d (N_ "Pad packet with empty bytes") -x
-complete -c ping -s Q -d (N_ "Set Quality of Service -related bits in ICMP datagrams") -x
-complete -c ping -s q -d (N_ "Quiet mode")
-complete -c ping -s R -d (N_ "Record route")
-complete -c ping -s r -d (N_ "Bypass the normal routing tables and send directly to a host on an attached interface")
-complete -c ping -s s -d (N_ "Specifies the number of data bytes to be sent") -x
-complete -c ping -s S -d (N_ "Set socket buffer size") -x
-complete -c ping -s t -d (N_ "Set the IP Time to Live") -x
-complete -c ping -s T -d (N_ "Set special IP timestamp options") -x
-complete -c ping -s M -d (N_ "Select Path MTU Discovery strategy") -x -a "do want dont"
-complete -c ping -s U -d (N_ "Print full user-to-user latency")
-complete -c ping -s v -d (N_ "Verbose mode")
-complete -c ping -s V -d (N_ "Display version and exit")
-complete -c ping -s w -d (N_ "Specify a timeout, in seconds, before ping exits regardless of how many packets have been sent or received") -x
-complete -c ping -s W -d (N_ "Time to wait for a response, in seconds") -x
+complete -c ping -s a --description "Audible ping"
+complete -c ping -s A --description "Adaptive ping"
+complete -c ping -s b --description "Allow pinging a broadcast address"
+complete -c ping -s B --description "Do not allow ping to change source address of probes"
+complete -c ping -s c --description "Stop after specified number of ECHO_REQUEST packets" -x
+complete -c ping -s d --description "Set the SO_DEBUG option on the socket being used"
+complete -c ping -s F --description "Allocate and set 20 bit flow label on ECHO_REQUEST packets" -x
+complete -c ping -s f --description "Flood ping"
+complete -c ping -s i --description "Wait specified interval of seconds between sending each packet" -x
+complete -c ping -s I --description "Set source address to specified interface address" -x -a "(__fish_print_interfaces; fish_print_addresses)"
+complete -c ping -s l --description "Send the specified number of packets without waiting for reply" -x
+complete -c ping -s L --description "Suppress loopback of multicast packets"
+complete -c ping -s n --description "Numeric output only"
+complete -c ping -s p --description "Pad packet with empty bytes" -x
+complete -c ping -s Q --description "Set Quality of Service -related bits in ICMP datagrams" -x
+complete -c ping -s q --description "Quiet mode"
+complete -c ping -s R --description "Record route"
+complete -c ping -s r --description "Bypass the normal routing tables and send directly to a host on an attached interface"
+complete -c ping -s s --description "Specifies the number of data bytes to be sent" -x
+complete -c ping -s S --description "Set socket buffer size" -x
+complete -c ping -s t --description "Set the IP Time to Live" -x
+complete -c ping -s T --description "Set special IP timestamp options" -x
+complete -c ping -s M --description "Select Path MTU Discovery strategy" -x -a "do want dont"
+complete -c ping -s U --description "Print full user-to-user latency"
+complete -c ping -s v --description "Verbose mode"
+complete -c ping -s V --description "Display version and exit"
+complete -c ping -s w --description "Specify a timeout, in seconds, before ping exits regardless of how many packets have been sent or received" -x
+complete -c ping -s W --description "Time to wait for a response, in seconds" -x
diff --git a/share/completions/prevd.fish b/share/completions/prevd.fish
index 327ac2f9..84423ceb 100644
--- a/share/completions/prevd.fish
+++ b/share/completions/prevd.fish
@@ -1 +1 @@
-complete -c prevd -s l -d (N_ "Also print directory history")
+complete -c prevd -s l --description "Also print directory history"
diff --git a/share/completions/ps.fish b/share/completions/ps.fish
index f2f4f451..513fd6fc 100644
--- a/share/completions/ps.fish
+++ b/share/completions/ps.fish
@@ -1,37 +1,37 @@
# Completions for ps
-complete -c ps -s A -d (N_ "Select all")
-complete -c ps -s N -d (N_ "Invert selection")
-complete -c ps -s a -d (N_ "Select all processes except session leaders and terminal-less")
-complete -c ps -s d -d (N_ "Select all processes except session leaders")
-complete -c ps -s e -d (N_ "Select all")
-complete -c ps -l deselect -d (N_ "Deselect all processes that do not fulfill conditions")
+complete -c ps -s A --description "Select all"
+complete -c ps -s N --description "Invert selection"
+complete -c ps -s a --description "Select all processes except session leaders and terminal-less"
+complete -c ps -s d --description "Select all processes except session leaders"
+complete -c ps -s e --description "Select all"
+complete -c ps -l deselect --description "Deselect all processes that do not fulfill conditions"
-complete -c ps -s C -d (N_ "Select by command") -r
-complete -c ps -s G -l Group -d (N_ "Select by group") -x -a "(__fish_complete_groups)"
+complete -c ps -s C --description "Select by command" -r
+complete -c ps -s G -l Group --description "Select by group" -x -a "(__fish_complete_groups)"
-complete -c ps -s U -l User -d (N_ "Select by user") -x -a "(__fish_complete_users)"
-complete -c ps -s u -l user -d (N_ "Select by user") -x -a "(__fish_complete_users)"
-complete -c ps -s g -l group -d (N_ "Select by group/session") -x -a "(__fish_complete_groups)"
-complete -c ps -s p -l pid -d (N_ "Select by PID") -x -a "(__fish_complete_pids)"
-complete -c ps -l ppid -d (N_ "Select by parent PID") -x -a "(__fish_complete_pids)"
-complete -c ps -s s -l sid -d (N_ "Select by session ID") -x -a "(__fish_complete_pids)"
-complete -c ps -s t -l tty -d (N_ "Select by tty") -r
-complete -c ps -s F -d (N_ "Extra full format")
-complete -c ps -s O -d (N_ "User defined format") -x
-complete -c ps -s M -d (N_ "Add column for security data")
-complete -c ps -s f -d (N_ "Full format")
-complete -c ps -s j -d (N_ "Jobs format")
-complete -c ps -s l -d (N_ "Long format")
-complete -c ps -s o -l format -d (N_ "User defined format") -x
-complete -c ps -s y -d (N_ "Do not show flags")
-complete -c ps -s Z -l context -d (N_ "Add column for security data")
-complete -c ps -s H -l forest -d (N_ "Show hierarchy")
-complete -c ps -s n -d (N_ "Set namelist file") -r
-complete -c ps -s w -d (N_ "Wide output")
-complete -c ps -s L -d (N_ "Show threads")
-complete -c ps -s T -d (N_ "Show threads")
-complete -c ps -s V -l version -d (N_ "Display version and exit")
-complete -c ps -l help -d (N_ "Display help and exit")
-complete -c ps -l info -d (N_ "Display debug info")
+complete -c ps -s U -l User --description "Select by user" -x -a "(__fish_complete_users)"
+complete -c ps -s u -l user --description "Select by user" -x -a "(__fish_complete_users)"
+complete -c ps -s g -l group --description "Select by group/session" -x -a "(__fish_complete_groups)"
+complete -c ps -s p -l pid --description "Select by PID" -x -a "(__fish_complete_pids)"
+complete -c ps -l ppid --description "Select by parent PID" -x -a "(__fish_complete_pids)"
+complete -c ps -s s -l sid --description "Select by session ID" -x -a "(__fish_complete_pids)"
+complete -c ps -s t -l tty --description "Select by tty" -r
+complete -c ps -s F --description "Extra full format"
+complete -c ps -s O --description "User defined format" -x
+complete -c ps -s M --description "Add column for security data"
+complete -c ps -s f --description "Full format"
+complete -c ps -s j --description "Jobs format"
+complete -c ps -s l --description "Long format"
+complete -c ps -s o -l format --description "User defined format" -x
+complete -c ps -s y --description "Do not show flags"
+complete -c ps -s Z -l context --description "Add column for security data"
+complete -c ps -s H -l forest --description "Show hierarchy"
+complete -c ps -s n --description "Set namelist file" -r
+complete -c ps -s w --description "Wide output"
+complete -c ps -s L --description "Show threads"
+complete -c ps -s T --description "Show threads"
+complete -c ps -s V -l version --description "Display version and exit"
+complete -c ps -l help --description "Display help and exit"
+complete -c ps -l info --description "Display debug info"
diff --git a/share/completions/psub.fish b/share/completions/psub.fish
index 08b2296e..ed1b20c5 100644
--- a/share/completions/psub.fish
+++ b/share/completions/psub.fish
@@ -1,2 +1,2 @@
-complete -c psub -s h -l help -d (N_ "Display help and exit")
-complete -c psub -s f -l file -d (N_ "Communicate using a regular file, not a named pipe")
+complete -c psub -s h -l help --description "Display help and exit"
+complete -c psub -s f -l file --description "Communicate using a regular file, not a named pipe"
diff --git a/share/completions/python.fish b/share/completions/python.fish
index 95bd3e3b..937677a3 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -1,14 +1,14 @@
-complete -c python -s c -x -d (N_ "Execute argument as command")
-complete -c python -s d -d (N_ "Debug on")
-complete -c python -s E -d (N_ "Ignore environment variables")
-complete -c python -s h -d (N_ "Display help and exit")
-complete -c python -s i -d (N_ "Interactive mode after executing commands")
-complete -c python -s O -d (N_ "Enable optimizations")
-complete -c python -s Q -x -a "old new" -d (N_ "Division control")
-complete -c python -s S -d (N_ "Disable import of site module")
-complete -c python -s t -d (N_ "Warn on mixed tabs and spaces")
-complete -c python -s u -d (N_ "Unbuffered input and output")
-complete -c python -s v -d (N_ "Verbose mode")
-complete -c python -s V -d (N_ "Display version and exit")
-complete -c python -s W -x -d (N_ "Warning control") -a "ignore default all module once error"
-complete -c python -s x -d (N_ "Ignore first line of input")
+complete -c python -s c -x --description "Execute argument as command"
+complete -c python -s d --description "Debug on"
+complete -c python -s E --description "Ignore environment variables"
+complete -c python -s h --description "Display help and exit"
+complete -c python -s i --description "Interactive mode after executing commands"
+complete -c python -s O --description "Enable optimizations"
+complete -c python -s Q -x -a "old new" --description "Division control"
+complete -c python -s S --description "Disable import of site module"
+complete -c python -s t --description "Warn on mixed tabs and spaces"
+complete -c python -s u --description "Unbuffered input and output"
+complete -c python -s v --description "Verbose mode"
+complete -c python -s V --description "Display version and exit"
+complete -c python -s W -x --description "Warning control" -a "ignore default all module once error"
+complete -c python -s x --description "Ignore first line of input"
diff --git a/share/completions/read.fish b/share/completions/read.fish
index 1a88aa69..5130993d 100644
--- a/share/completions/read.fish
+++ b/share/completions/read.fish
@@ -1,8 +1,8 @@
-complete -c read -s h -l help -d (N_ "Display help and exit")
-complete -c read -s p -l prompt -d (N_ "Set prompt command") -x
-complete -c read -s x -l export -d (N_ "Export variable to subprocess")
-complete -c read -s g -l global -d (N_ "Make variable scope global")
-complete -c read -s l -l local -d (N_ "Make variable scope local")
-complete -c read -s U -l universal -d (N_ "Make variable scope universal, i.e. share variable with all the users fish processes on this computer")
-complete -c read -s u -l unexport -d (N_ "Do not export variable to subprocess")
-complete -c read -s m -l mode-name -d (N_ "Name to load/save history under") -r -a "read fish"
+complete -c read -s h -l help --description "Display help and exit"
+complete -c read -s p -l prompt --description "Set prompt command" -x
+complete -c read -s x -l export --description "Export variable to subprocess"
+complete -c read -s g -l global --description "Make variable scope global"
+complete -c read -s l -l local --description "Make variable scope local"
+complete -c read -s U -l universal --description "Make variable scope universal, i.e. share variable with all the users fish processes on this computer"
+complete -c read -s u -l unexport --description "Do not export variable to subprocess"
+complete -c read -s m -l mode-name --description "Name to load/save history under" -r -a "read fish"
diff --git a/share/completions/renice.fish b/share/completions/renice.fish
index 5d7eb5e2..dc1f636e 100644
--- a/share/completions/renice.fish
+++ b/share/completions/renice.fish
@@ -1,4 +1,4 @@
-complete -c renice -s p -d (N_ "Force following parameters to be process ID's (The default)")
-complete -c renice -s g -d (N_ "Force following parameters to be interpreted as process group ID's")
-complete -c renice -s u -d (N_ "Force following parameters to be interpreted as user names")
+complete -c renice -s p --description "Force following parameters to be process ID's (The default)"
+complete -c renice -s g --description "Force following parameters to be interpreted as process group ID's"
+complete -c renice -s u --description "Force following parameters to be interpreted as user names"
diff --git a/share/completions/rm.fish b/share/completions/rm.fish
index fbb03809..4184d6a9 100644
--- a/share/completions/rm.fish
+++ b/share/completions/rm.fish
@@ -1,11 +1,11 @@
#Completions for rm
-complete -c rm -s d -l directory -d (N_ "Unlink directory (Only by superuser)")
-complete -c rm -s f -l force -d (N_ "Never prompt before removal")
-complete -c rm -s i -l interactive -d (N_ "Prompt before removal")
-complete -c rm -s r -l recursive -d (N_ "Recursively remove subdirectories")
-complete -c rm -s R -d (N_ "Recursively remove subdirectories")
-complete -c rm -s v -l verbose -d (N_ "Explain what is done")
-complete -c rm -s h -l help -d (N_ "Display help and exit")
-complete -c rm -l version -d (N_ "Display version and exit")
+complete -c rm -s d -l directory --description "Unlink directory (Only by superuser)"
+complete -c rm -s f -l force --description "Never prompt before removal"
+complete -c rm -s i -l interactive --description "Prompt before removal"
+complete -c rm -s r -l recursive --description "Recursively remove subdirectories"
+complete -c rm -s R --description "Recursively remove subdirectories"
+complete -c rm -s v -l verbose --description "Explain what is done"
+complete -c rm -s h -l help --description "Display help and exit"
+complete -c rm -l version --description "Display version and exit"
diff --git a/share/completions/rmdir.fish b/share/completions/rmdir.fish
index 15879fd8..2cd1e569 100644
--- a/share/completions/rmdir.fish
+++ b/share/completions/rmdir.fish
@@ -1,8 +1,8 @@
#Completions for rmdir
complete -x -c rmdir -a "(__fish_complete_directories (commandline -ct))"
-complete -c rmdir -l ignore-fail-on-non-empty -d (N_ "Ignore errors from non-empty directories")
-complete -c rmdir -s p -l parents -d (N_ "Remove each component of path")
-complete -c rmdir -s v -l verbose -d (N_ "Verbose mode")
-complete -c rmdir -l help -d (N_ "Display help and exit")
-complete -c rmdir -l version -d (N_ "Display version and exit")
+complete -c rmdir -l ignore-fail-on-non-empty --description "Ignore errors from non-empty directories"
+complete -c rmdir -s p -l parents --description "Remove each component of path"
+complete -c rmdir -s v -l verbose --description "Verbose mode"
+complete -c rmdir -l help --description "Display help and exit"
+complete -c rmdir -l version --description "Display version and exit"
diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish
index f060a0e9..75aa7967 100644
--- a/share/completions/rpm.fish
+++ b/share/completions/rpm.fish
@@ -1,131 +1,131 @@
# Completions for the rpm command. Insanely complicated,
# since rpm has multiple operation modes, and a perverse number of switches.
-complete -c rpm -s "?" -l help -d (N_ "Display help and exit")
-complete -c rpm -l version -d (N_ "Display version and exit")
-complete -c rpm -l quiet -d (N_ "Quiet mode")
-complete -c rpm -s v -d (N_ "Verbose mode")
-complete -c rpm -l rcfile -d (N_ "List of rpm configuration files") -f
-complete -c rpm -l pipe -d (N_ "Pipe output through specified command") -r
-complete -c rpm -l dbpath -d (N_ "Specify directory for rpm database") -a "
+complete -c rpm -s "?" -l help --description "Display help and exit"
+complete -c rpm -l version --description "Display version and exit"
+complete -c rpm -l quiet --description "Quiet mode"
+complete -c rpm -s v --description "Verbose mode"
+complete -c rpm -l rcfile --description "List of rpm configuration files" -f
+complete -c rpm -l pipe --description "Pipe output through specified command" -r
+complete -c rpm -l dbpath --description "Specify directory for rpm database" -a "
(
__fish_complete_directories (commandline -ct) 'Rpm database directory'
)
"
-complete -c rpm -l root -d (N_ "Specify root directory for rpm operations") -a "
+complete -c rpm -l root --description "Specify root directory for rpm operations" -a "
(
__fish_complete_directories (commandline -ct) 'Root directory for rpm operations'
)
"
set rpm_install -c rpm -n "__fish_contains_opt -s i -s U -s F install upgrade freshen"
-complete $rpm_install -l aid -d (N_ "Add suggested packages to the transaction set when needed")
-complete $rpm_install -l allfiles -d (N_ "Installs or upgrades all the files in the package, even if they aren't needed (missingok) and don't exist")
-complete $rpm_install -l badreloc -d (N_ "Used with --relocate, permit relocations on all file paths, not just those OLD-PATH's included in the binary package relocation hint(s)")
-complete $rpm_install -l excludepath -d (N_ "Don't install files whose name begins with specified path") -xa "(__fish_complete_directories (commandline -ct) 'Skip installation of files in this directory')"
-complete $rpm_install -l excludedocs -d (N_ "Don't install any files which are marked as documentation")
-complete $rpm_install -l force -d (N_ 'Same as using --replacepkgs, --replacefiles, and --oldpackage')
-complete $rpm_install -s h -l hash -d (N_ 'Print 50 hash marks as the package archive is unpacked')
-complete $rpm_install -l ignoresize -d (N_ "Don't check for sufficient disk space before installation")
-complete $rpm_install -l ignorearch -d (N_ "Allow installation or upgrading even if the architectures of the binary package and host don't match")
-complete $rpm_install -l ignoreos -d (N_ "Allow installation or upgrading even if the operating systems of the binary package and host don't match")
-complete $rpm_install -l includedocs -d (N_ 'Install documentation files (default)')
-complete $rpm_install -l justdb -d (N_ 'Update only the database, not the filesystem')
-complete $rpm_install -l nodigest -d (N_ "Don't verify package or header digests when reading")
-complete $rpm_install -l nosignature -d (N_ "Don't verify package or header signatures when reading")
-complete $rpm_install -l nodeps -d (N_ "Don't do a dependency check")
-complete $rpm_install -l nosuggest -d (N_ "Don't suggest package(s) that provide a missing dependency")
+complete $rpm_install -l aid --description "Add suggested packages to the transaction set when needed"
+complete $rpm_install -l allfiles --description "Installs or upgrades all the files in the package, even if they aren't needed (missingok) and don't exist"
+complete $rpm_install -l badreloc --description "Used with --relocate, permit relocations on all file paths, not just those OLD-PATH's included in the binary package relocation hint(s)"
+complete $rpm_install -l excludepath --description "Don't install files whose name begins with specified path" -xa "(__fish_complete_directories (commandline -ct) 'Skip installation of files in this directory')"
+complete $rpm_install -l excludedocs --description "Don't install any files which are marked as documentation"
+complete $rpm_install -l force --description 'Same as using --replacepkgs, --replacefiles, and --oldpackage'
+complete $rpm_install -s h -l hash --description 'Print 50 hash marks as the package archive is unpacked'
+complete $rpm_install -l ignoresize --description "Don't check for sufficient disk space before installation"
+complete $rpm_install -l ignorearch --description "Allow installation or upgrading even if the architectures of the binary package and host don't match"
+complete $rpm_install -l ignoreos --description "Allow installation or upgrading even if the operating systems of the binary package and host don't match"
+complete $rpm_install -l includedocs --description 'Install documentation files (default)'
+complete $rpm_install -l justdb --description 'Update only the database, not the filesystem'
+complete $rpm_install -l nodigest --description "Don't verify package or header digests when reading"
+complete $rpm_install -l nosignature --description "Don't verify package or header signatures when reading"
+complete $rpm_install -l nodeps --description "Don't do a dependency check"
+complete $rpm_install -l nosuggest --description "Don't suggest package(s) that provide a missing dependency"
complete $rpm_install -l noorder -d (N_ "Don't change the package installation order" )
-complete $rpm_install -l noscripts -d (N_ "Don't execute scripts")
-complete $rpm_install -l nopre -d (N_ "Don't execute pre scripts")
-complete $rpm_install -l nopost -d (N_ "Don't execute post scripts")
-complete $rpm_install -l nopreun -d (N_ "Don't execute preun scripts")
-complete $rpm_install -l nopostun -d (N_ "Don't execute postun scripts")
-complete $rpm_install -l notriggers -d (N_ "Don't execute trigger scriptlets")
-complete $rpm_install -l notriggerin -d (N_ "Don't execute triggerin scriptlets")
-complete $rpm_install -l notriggerun -d (N_ "Don't execute triggerun scriptlets")
-complete $rpm_install -l notriggerpostun -d (N_ "Don't execute triggerpostun scriptlets")
-complete $rpm_install -l oldpackage -d (N_ 'Allow an upgrade to replace a newer package with an older one')
-complete $rpm_install -l percent -d (N_ 'Print percentages as files are unpacked from the package archive. This is intended to make rpm easy to run from other tools')
-complete $rpm_install -l prefix -d (N_ 'For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to NEWPATH') -xa "(__fish_complete_directories (commandline -ct) 'Directory prefix for relocatable packages')"
+complete $rpm_install -l noscripts --description "Don't execute scripts"
+complete $rpm_install -l nopre --description "Don't execute pre scripts"
+complete $rpm_install -l nopost --description "Don't execute post scripts"
+complete $rpm_install -l nopreun --description "Don't execute preun scripts"
+complete $rpm_install -l nopostun --description "Don't execute postun scripts"
+complete $rpm_install -l notriggers --description "Don't execute trigger scriptlets"
+complete $rpm_install -l notriggerin --description "Don't execute triggerin scriptlets"
+complete $rpm_install -l notriggerun --description "Don't execute triggerun scriptlets"
+complete $rpm_install -l notriggerpostun --description "Don't execute triggerpostun scriptlets"
+complete $rpm_install -l oldpackage --description 'Allow an upgrade to replace a newer package with an older one'
+complete $rpm_install -l percent --description 'Print percentages as files are unpacked from the package archive. This is intended to make rpm easy to run from other tools'
+complete $rpm_install -l prefix --description 'For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to NEWPATH' -xa "(__fish_complete_directories (commandline -ct) 'Directory prefix for relocatable packages')"
complete $rpm_install -l relocate -x -d (N_ "Translate all paths that start with first half of following parameter to second half of following parameter" )
-complete $rpm_install -l repackage -d (N_ 'Re-package the files before erasing')
-complete $rpm_install -l replacefiles -d (N_ 'Install the packages even if they replace files from other, already installed, packages')
-complete $rpm_install -l replacepkgs -d (N_ 'Install the packages even if some of them are already installed on this system')
-complete $rpm_install -l test -d (N_ "Don't install the package, simply check for and report potential conflicts")
+complete $rpm_install -l repackage --description 'Re-package the files before erasing'
+complete $rpm_install -l replacefiles --description 'Install the packages even if they replace files from other, already installed, packages'
+complete $rpm_install -l replacepkgs --description 'Install the packages even if some of them are already installed on this system'
+complete $rpm_install -l test --description "Don't install the package, simply check for and report potential conflicts"
set -e rpm_install
set rpm_query -c rpm -n "__fish_contains_opt -s q query"
-complete $rpm_query -l changelog -d (N_ 'Display change information for the package')
-complete $rpm_query -s c -l configfiles -d (N_ 'List only configuration files (implies -l)')
-complete $rpm_query -s d -l docfiles -d (N_ 'List only documentation files (implies -l)')
-complete $rpm_query -l dump -d (N_ 'Dump file information. Must be used with at least one of -l, -c, -d')
-complete $rpm_query -l filesbypkg -d (N_ 'List all the files in each selected package')
-complete $rpm_query -s i -l info -d (N_ 'Display package information, including name, version, and description. Uses --queryformat if specified')
-complete $rpm_query -l last -d (N_ 'Orders the package listing by install time')
-complete $rpm_query -s l -l list -d (N_ 'List files in package')
-complete $rpm_query -l provides -d (N_ 'List capabilities this package provides')
-complete $rpm_query -s R -l requires -d (N_ 'List packages on which this package depends')
-complete $rpm_query -l scripts -d (N_ 'List the package specific scriptlets')
-complete $rpm_query -s s -l state -d (N_ 'Display the states of files in the package. The state of each file is one of normal, not installed, or replaced')
-complete $rpm_query -l triggers -d (N_ 'Display the trigger scripts contained in the package')
-complete $rpm_query -l triggerscripts -d (N_ 'Display the trigger scripts contained in the package')
+complete $rpm_query -l changelog --description 'Display change information for the package'
+complete $rpm_query -s c -l configfiles --description 'List only configuration files (implies -l)'
+complete $rpm_query -s d -l docfiles --description 'List only documentation files (implies -l)'
+complete $rpm_query -l dump --description 'Dump file information. Must be used with at least one of -l, -c, -d'
+complete $rpm_query -l filesbypkg --description 'List all the files in each selected package'
+complete $rpm_query -s i -l info --description 'Display package information, including name, version, and description. Uses --queryformat if specified'
+complete $rpm_query -l last --description 'Orders the package listing by install time'
+complete $rpm_query -s l -l list --description 'List files in package'
+complete $rpm_query -l provides --description 'List capabilities this package provides'
+complete $rpm_query -s R -l requires --description 'List packages on which this package depends'
+complete $rpm_query -l scripts --description 'List the package specific scriptlets'
+complete $rpm_query -s s -l state --description 'Display the states of files in the package. The state of each file is one of normal, not installed, or replaced'
+complete $rpm_query -l triggers --description 'Display the trigger scripts contained in the package'
+complete $rpm_query -l triggerscripts --description 'Display the trigger scripts contained in the package'
set -e rpm_query
set rpm_select -c rpm -n "__fish_contains_opt -s q -s V query verify"
complete $rpm_select -a "(__fish_print_packages)"
-complete $rpm_select -s a -l all -d (N_ 'Query all installed packages')
-complete $rpm_select -s f -l file -d (N_ 'Query package owning specified file') -r
-complete $rpm_select -l fileid -d (N_ 'Query package that contains a given file identifier, i.e. the MD5 digest of the file contents') -x
-complete $rpm_select -s g -l group -d (N_ 'Query packages with the specified group') -x
-complete $rpm_select -l hdrid -d (N_ 'Query package that contains a given header identifier, i.e. the SHA1 digest of the immutable header region') -x
-complete $rpm_select -s p -l package -d (N_ 'Query an (uninstalled) package in specified file') -xa "(__fish_complete_suffix (commandline -ct) .rpm 'Query package file')"
-complete $rpm_select -l pkgid -d (N_ 'Query package that contains a given package identifier, i.e. the MD5 digest of the combined header and payload contents') -x
-complete $rpm_select -l specfile -d (N_ 'Parse and query specified spec-file as if it were a package') -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')"
-complete $rpm_select -l tid -d (N_ 'Query package(s) that have the specified TID (transaction identifier)') -x
-complete $rpm_select -l triggeredby -d (N_ 'Query packages that are triggered by the specified packages') -x -a "(__fish_print_packages)"
-complete $rpm_select -l whatprovides -d (N_ 'Query all packages that provide the specified capability') -x
-complete $rpm_select -l whatrequires -d (N_ 'Query all packages that requires the specified capability for functioning') -x
+complete $rpm_select -s a -l all --description 'Query all installed packages'
+complete $rpm_select -s f -l file --description 'Query package owning specified file' -r
+complete $rpm_select -l fileid --description 'Query package that contains a given file identifier, i.e. the MD5 digest of the file contents' -x
+complete $rpm_select -s g -l group --description 'Query packages with the specified group' -x
+complete $rpm_select -l hdrid --description 'Query package that contains a given header identifier, i.e. the SHA1 digest of the immutable header region' -x
+complete $rpm_select -s p -l package --description 'Query an (uninstalled) package in specified file' -xa "(__fish_complete_suffix (commandline -ct) .rpm 'Query package file')"
+complete $rpm_select -l pkgid --description 'Query package that contains a given package identifier, i.e. the MD5 digest of the combined header and payload contents' -x
+complete $rpm_select -l specfile --description 'Parse and query specified spec-file as if it were a package' -xa "(__fish_complete_suffix (commandline -ct) .spec 'Query package spec file')"
+complete $rpm_select -l tid --description 'Query package(s) that have the specified TID (transaction identifier)' -x
+complete $rpm_select -l triggeredby --description 'Query packages that are triggered by the specified packages' -x -a "(__fish_print_packages)"
+complete $rpm_select -l whatprovides --description 'Query all packages that provide the specified capability' -x
+complete $rpm_select -l whatrequires --description 'Query all packages that requires the specified capability for functioning' -x
set -e rpm_select
set rpm_verify -c rpm -n "__fish_contains_opt -s V verify"
-complete $rpm_verify -l nodeps -d (N_ "Don't verify dependencies of packages")
-complete $rpm_verify -l nodigest -d (N_ "Don't verify package or header digests when reading")
-complete $rpm_verify -l nofiles -d (N_ "Don't verify any attributes of package files")
-complete $rpm_verify -l noscripts -d (N_ "Don't execute the %verifyscript scriptlet")
-complete $rpm_verify -l nosignature -d (N_ "Don't verify package or header signatures when reading")
-complete $rpm_verify -l nolinkto -d (N_ "Don't verify linkto attribute")
-complete $rpm_verify -l nomd5 -d (N_ "Don't verify md5 attribute")
-complete $rpm_verify -l nosize -d (N_ "Don't verify size attribute")
-complete $rpm_verify -l nouser -d (N_ "Don't verify user attribute")
-complete $rpm_verify -l nogroup -d (N_ "Don't verify group attribute")
-complete $rpm_verify -l nomtime -d (N_ "Don't verify time attribute")
-complete $rpm_verify -l nomode -d (N_ "Don't verify mode attribute")
-complete $rpm_verify -l nordev -d (N_ "Don't verify dev attribute")
+complete $rpm_verify -l nodeps --description "Don't verify dependencies of packages"
+complete $rpm_verify -l nodigest --description "Don't verify package or header digests when reading"
+complete $rpm_verify -l nofiles --description "Don't verify any attributes of package files"
+complete $rpm_verify -l noscripts --description "Don't execute the %verifyscript scriptlet"
+complete $rpm_verify -l nosignature --description "Don't verify package or header signatures when reading"
+complete $rpm_verify -l nolinkto --description "Don't verify linkto attribute"
+complete $rpm_verify -l nomd5 --description "Don't verify md5 attribute"
+complete $rpm_verify -l nosize --description "Don't verify size attribute"
+complete $rpm_verify -l nouser --description "Don't verify user attribute"
+complete $rpm_verify -l nogroup --description "Don't verify group attribute"
+complete $rpm_verify -l nomtime --description "Don't verify time attribute"
+complete $rpm_verify -l nomode --description "Don't verify mode attribute"
+complete $rpm_verify -l nordev --description "Don't verify dev attribute"
set -e rpm_verify
set rpm_erase -c rpm -n "__fish_contains_opt -s e erase"
complete $rpm_erase -a "(__fish_print_packages)"
-complete $rpm_erase -l allmatches -d (N_ 'Remove all versions of the package which match specified string')
-complete $rpm_erase -l nodeps -d (N_ "Don't check dependencies before uninstalling the packages")
-complete $rpm_erase -l noscripts -d (N_ "Don't execute scriplets")
-complete $rpm_erase -l nopreun -d (N_ "Don't execute preun scriptlet")
-complete $rpm_erase -l nopostun -d (N_ "Don't execute postun scriptlet")
-complete $rpm_erase -l notriggers -d (N_ "Don't execute trigger scriptlets")
-complete $rpm_erase -l notriggerun -d (N_ "Don't execute triggerun scriptlets")
-complete $rpm_erase -l notriggerpostun -d (N_ "Don't execute triggerpostun scriptlets")
-complete $rpm_erase -l repackage -d (N_ 'Re-package the files before erasing')
+complete $rpm_erase -l allmatches --description 'Remove all versions of the package which match specified string'
+complete $rpm_erase -l nodeps --description "Don't check dependencies before uninstalling the packages"
+complete $rpm_erase -l noscripts --description "Don't execute scriplets"
+complete $rpm_erase -l nopreun --description "Don't execute preun scriptlet"
+complete $rpm_erase -l nopostun --description "Don't execute postun scriptlet"
+complete $rpm_erase -l notriggers --description "Don't execute trigger scriptlets"
+complete $rpm_erase -l notriggerun --description "Don't execute triggerun scriptlets"
+complete $rpm_erase -l notriggerpostun --description "Don't execute triggerpostun scriptlets"
+complete $rpm_erase -l repackage --description 'Re-package the files before erasing'
complete $rpm_erase -l test -d (N_ "Don't really uninstall anything" )
set -e rpm_erase
set rpm_mode -c rpm -n '__fish_contains_opt -s e -s i -s F -s V -s U -s q erase install freshen verify upgrade query; if test $status = 0; false; else; true; end'
-complete $rpm_mode -s i -l install -d (N_ 'Install new package')
-complete $rpm_mode -s U -l upgrade -d (N_ 'Upgrade existing package')
-complete $rpm_mode -s F -l freshen -d (N_ 'Upgrade package if already installed')
-complete $rpm_mode -s q -l query -d (N_ 'Query installed packages')
-complete $rpm_mode -s V -l verify -d (N_ 'Verify package integrity')
-complete $rpm_mode -s e -l erase -d (N_ 'Erase package')
+complete $rpm_mode -s i -l install --description 'Install new package'
+complete $rpm_mode -s U -l upgrade --description 'Upgrade existing package'
+complete $rpm_mode -s F -l freshen --description 'Upgrade package if already installed'
+complete $rpm_mode -s q -l query --description 'Query installed packages'
+complete $rpm_mode -s V -l verify --description 'Verify package integrity'
+complete $rpm_mode -s e -l erase --description 'Erase package'
set -e rpm_mode
complete -c rpm -xa '(__fish_complete_suffix (commandline -ct) .rpm (_ "Package") )'
diff --git a/share/completions/ruby.fish b/share/completions/ruby.fish
index 78cabbee..8898e7ff 100644
--- a/share/completions/ruby.fish
+++ b/share/completions/ruby.fish
@@ -1,25 +1,25 @@
#Completions for ruby
-complete -c ruby -s 0 -d (N_ 'Specify record separator')
-complete -c ruby -s a -d (N_ 'Turn on autosplit mode')
-complete -c ruby -s c -d (N_ 'Check syntax')
-complete -c ruby -s K -d (N_ 'Kanji code-set')
-complete -c ruby -s d -l debug -d (N_ 'Debugger')
-complete -c ruby -s e -x -d (N_ 'Execute command')
-complete -c ruby -s h -l help -d (N_ 'Display help and exit')
-complete -c ruby -s F -d (N_ 'Set regexp used to split input')
-complete -c ruby -s i -d (N_ 'Edit files in-place')
-complete -c ruby -s I -d (N_ 'Include path')
-complete -c ruby -s l -d (N_ 'Automatic line ending processing')
-complete -c ruby -s n -d (N_ 'Loop script')
-complete -c ruby -s p -d (N_ 'Loop script, print $_')
-complete -c ruby -s r -r -d (N_ 'Require file')
-complete -c ruby -s s -d (N_ 'Define custom switches')
-complete -c ruby -s S -d (N_ 'Search $PATH for script')
-complete -c ruby -s T -d (N_ 'Taint checking')
-complete -c ruby -s v -l verbose -d (N_ 'Verbose mode')
-complete -c ruby -s w -d (N_ 'Verbose mode without message')
-complete -c ruby -l version -d (N_ 'Display version and exit')
-complete -c ruby -s x -d (N_ 'Extract script')
-complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' -d (N_ 'Directory')
-complete -c ruby -s y -l yydebug -d (N_ 'Compiler debug mode')
+complete -c ruby -s 0 --description 'Specify record separator'
+complete -c ruby -s a --description 'Turn on autosplit mode'
+complete -c ruby -s c --description 'Check syntax'
+complete -c ruby -s K --description 'Kanji code-set'
+complete -c ruby -s d -l debug --description 'Debugger'
+complete -c ruby -s e -x --description 'Execute command'
+complete -c ruby -s h -l help --description 'Display help and exit'
+complete -c ruby -s F --description 'Set regexp used to split input'
+complete -c ruby -s i --description 'Edit files in-place'
+complete -c ruby -s I --description 'Include path'
+complete -c ruby -s l --description 'Automatic line ending processing'
+complete -c ruby -s n --description 'Loop script'
+complete -c ruby -s p --description 'Loop script, print $_'
+complete -c ruby -s r -r --description 'Require file'
+complete -c ruby -s s --description 'Define custom switches'
+complete -c ruby -s S --description 'Search $PATH for script'
+complete -c ruby -s T --description 'Taint checking'
+complete -c ruby -s v -l verbose --description 'Verbose mode'
+complete -c ruby -s w --description 'Verbose mode without message'
+complete -c ruby -l version --description 'Display version and exit'
+complete -c ruby -s x --description 'Extract script'
+complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' --description 'Directory'
+complete -c ruby -s y -l yydebug --description 'Compiler debug mode'
diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index 77c8bf6c..c06f4d95 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -25,11 +25,11 @@ complete -c scp -d Hostname -a "
(__fish_print_users)@
"
-complete -c scp -s B -d (N_ "Batch mode")
-complete -c scp -s l -x -d (N_ "Bandwidth limit")
-complete -c scp -s P -x -d (N_ "Port")
-complete -c scp -s p -d (N_ "Preserves modification times, access times, and modes from the original file")
-complete -c scp -s q -d (N_ "Do not display progress bar")
-complete -c scp -s r -d (N_ "Recursively copy")
-complete -c scp -s S -d (N_ "Encyption program")
+complete -c scp -s B --description "Batch mode"
+complete -c scp -s l -x --description "Bandwidth limit"
+complete -c scp -s P -x --description "Port"
+complete -c scp -s p --description "Preserves modification times, access times, and modes from the original file"
+complete -c scp -s q --description "Do not display progress bar"
+complete -c scp -s r --description "Recursively copy"
+complete -c scp -s S --description "Encyption program"
diff --git a/share/completions/screen.fish b/share/completions/screen.fish
index bd0525da..2a2b0776 100644
--- a/share/completions/screen.fish
+++ b/share/completions/screen.fish
@@ -1,4 +1,4 @@
-function __fish_complete_screen -d (N_ "Print a list of running screen sessions")
+function __fish_complete_screen --description "Print a list of running screen sessions"
screen -list |sgrep \^\t.\*\(.\*\)|sed -e 's/\t\(.*\)\t(\(.*\))/\1'\t'Screen: \2/'
end
diff --git a/share/completions/sed.fish b/share/completions/sed.fish
index ebba98d3..715d4dee 100644
--- a/share/completions/sed.fish
+++ b/share/completions/sed.fish
@@ -9,30 +9,30 @@ sed --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
# Shared ls switches
-__fish_gnu_complete -c sed -s n -l quiet -d (N_ "Silent mode") $is_gnu
-__fish_gnu_complete -c sed -s e -l expression -x -d (N_ "Evaluate expression") $is_gnu
-__fish_gnu_complete -c sed -s f -l file -r -d (N_ "Evalute file") $is_gnu
-__fish_gnu_complete -c sed -s i -l in-place -d (N_ "Edit files in place") $is_gnu
+__fish_gnu_complete -c sed -s n -l quiet --description "Silent mode" $is_gnu
+__fish_gnu_complete -c sed -s e -l expression -x --description "Evaluate expression" $is_gnu
+__fish_gnu_complete -c sed -s f -l file -r --description "Evalute file" $is_gnu
+__fish_gnu_complete -c sed -s i -l in-place --description "Edit files in place" $is_gnu
if test -n "$is_gnu"
# GNU specific features
- complete -c sed -l silent -d (N_ "Silent mode")
- complete -c sed -s l -l line-length -x -d (N_ "Specify line-length")
- complete -c sed -l posix -d (N_ "Disable all GNU extensions")
- complete -c sed -s r -l regexp-extended -d (N_ "Use extended regexp")
- complete -c sed -s s -l separate -d (N_ "Consider files as separate")
- complete -c sed -s u -l unbuffered -d (N_ "Use minimal IO buffers")
- complete -c sed -l help -d (N_ "Display help and exit")
- complete -c sed -s V -l version -d (N_ "Display version and exit")
+ complete -c sed -l silent --description "Silent mode"
+ complete -c sed -s l -l line-length -x --description "Specify line-length"
+ complete -c sed -l posix --description "Disable all GNU extensions"
+ complete -c sed -s r -l regexp-extended --description "Use extended regexp"
+ complete -c sed -s s -l separate --description "Consider files as separate"
+ complete -c sed -s u -l unbuffered --description "Use minimal IO buffers"
+ complete -c sed -l help --description "Display help and exit"
+ complete -c sed -s V -l version --description "Display version and exit"
else
# If not a GNU system, assume we have standard BSD ls features instead
- complete -c sed -s E -d (N_ "Use extended regexp")
- complete -c sed -s a -d (N_ "Delay opening files until a command containing the related 'w' function is applied")
- complete -c sed -s l -d (N_ "Use line buffering")
+ complete -c sed -s E --description "Use extended regexp"
+ complete -c sed -s a --description "Delay opening files until a command containing the related 'w' function is applied"
+ complete -c sed -s l --description "Use line buffering"
end
diff --git a/share/completions/service.fish b/share/completions/service.fish
index 5fd4336a..f9055c9e 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -1,6 +1,6 @@
# Fist argument is the names of the service, i.e. a file in /etc/init.d
-complete -c service -n "test (count (commandline -poc)) = 1" -xa "(command ls /etc/init.d)" -d (N_ "Service name")
+complete -c service -n "test (count (commandline -poc)) = 1" -xa "(command ls /etc/init.d)" --description "Service name"
#The second argument is what action to take with the service
complete -c service -n "test (count (commandline -poc)) -gt 1" -xa '$__fish_service_commands'
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 6526c501..386fd780 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -55,15 +55,15 @@ end
# Regular switches, set only accepts these before the variable name,
# so we need to test using __fish_is_first_token
-complete -c set -n '__fish_is_first_token' -s e -l erase -d (N_ "Erase variable")
-complete -c set -n '__fish_is_first_token' -s x -l export -d (N_ "Export variable to subprocess")
-complete -c set -n '__fish_is_first_token' -s u -l unexport -d (N_ "Do not export variable to subprocess")
-complete -c set -n '__fish_is_first_token' -s g -l global -d (N_ "Make variable scope global")
-complete -c set -n '__fish_is_first_token' -s l -l local -d (N_ "Make variable scope local")
-complete -c set -n '__fish_is_first_token' -s U -l universal -d (N_ "Make variable scope universal, i.e. share variable with all the users fish processes on this computer")
-complete -c set -n '__fish_is_first_token' -s q -l query -d (N_ "Test if variable is defined")
-complete -c set -n '__fish_is_first_token' -s h -l help -d (N_ "Display help and exit")
-complete -c set -n '__fish_is_first_token' -s n -l names -d (N_ "List the names of the variables, but not their value")
+complete -c set -n '__fish_is_first_token' -s e -l erase --description "Erase variable"
+complete -c set -n '__fish_is_first_token' -s x -l export --description "Export variable to subprocess"
+complete -c set -n '__fish_is_first_token' -s u -l unexport --description "Do not export variable to subprocess"
+complete -c set -n '__fish_is_first_token' -s g -l global --description "Make variable scope global"
+complete -c set -n '__fish_is_first_token' -s l -l local --description "Make variable scope local"
+complete -c set -n '__fish_is_first_token' -s U -l universal --description "Make variable scope universal, i.e. share variable with all the users fish processes on this computer"
+complete -c set -n '__fish_is_first_token' -s q -l query --description "Test if variable is defined"
+complete -c set -n '__fish_is_first_token' -s h -l help --description "Display help and exit"
+complete -c set -n '__fish_is_first_token' -s n -l names --description "List the names of the variables, but not their value"
# Complete using preexisting variable names
@@ -71,8 +71,8 @@ complete -c set -n '__fish_is_first_token' -x -a "(set|sed -e 's/ /'\t'Variable:
# Color completions
complete -c set -n '__fish_set_is_color' -x -a '(set_color --print-colors)' -d (N_ Color)
-complete -c set -n '__fish_set_is_color' -s b -l background -x -a '(set_color --print-colors)' -d (N_ "Change background color")
-complete -c set -n '__fish_set_is_color' -s o -l bold -d (N_ 'Make font bold')
+complete -c set -n '__fish_set_is_color' -s b -l background -x -a '(set_color --print-colors)' --description "Change background color"
+complete -c set -n '__fish_set_is_color' -s o -l bold --description 'Make font bold'
# Locale completions
complete -c set -n '__fish_is_first_token' -x -a '$__fish_locale_vars' -d 'Locale variable'
diff --git a/share/completions/set_color.fish b/share/completions/set_color.fish
index d62e8a7d..09bf1218 100644
--- a/share/completions/set_color.fish
+++ b/share/completions/set_color.fish
@@ -1,8 +1,8 @@
-complete -c set_color -x -d (N_ "Color") -a '(set_color --print-colors)'
-complete -c set_color -s b -l background -x -a '(set_color --print-colors)' -d (N_ "Change background color")
-complete -c set_color -s o -l bold -d (N_ 'Make font bold')
-complete -c set_color -s u -l underline -d (N_ 'Underline text')
-complete -c set_color -s v -l version -d (N_ 'Display version and exit')
-complete -c set_color -s h -l help -d (N_ 'Display help and exit')
-complete -c set_color -s c -l print-colors -d (N_ 'Print a list of all accepted color names')
+complete -c set_color -x --description "Color" -a '(set_color --print-colors)'
+complete -c set_color -s b -l background -x -a '(set_color --print-colors)' --description "Change background color"
+complete -c set_color -s o -l bold --description 'Make font bold'
+complete -c set_color -s u -l underline --description 'Underline text'
+complete -c set_color -s v -l version --description 'Display version and exit'
+complete -c set_color -s h -l help --description 'Display help and exit'
+complete -c set_color -s c -l print-colors --description 'Print a list of all accepted color names'
diff --git a/share/completions/sort.fish b/share/completions/sort.fish
index a0c79f1b..13ac6aed 100644
--- a/share/completions/sort.fish
+++ b/share/completions/sort.fish
@@ -1,21 +1,21 @@
-complete -c sort -s b -l ignore-leading-blanks -d (N_ "Ignore leading blanks")
-complete -c sort -s d -l dictionary-order -d (N_ "Consider only blanks and alphanumerics")
-complete -c sort -s f -l ignore-case -d (N_ "Ignore case")
-complete -c sort -s g -l general-numeric-sort -d (N_ "Compare general numeric value")
-complete -c sort -s i -l ignore-nonprinting -d (N_ "Consider only printable")
-complete -c sort -s M -l month-sort -d (N_ "Compare month names")
-complete -c sort -s n -l numeric-sort -d (N_ "Compare string numerical value")
-complete -c sort -s r -l reverse -d (N_ "Reverse results")
-complete -c sort -s c -l check -d (N_ "Only check if sorted")
-complete -c sort -s k -l key -d (N_ "Define key")
-complete -c sort -s m -l merge -d (N_ "Merge sorted files")
-complete -c sort -s o -l output -f -d (N_ "Write to file")
-complete -c sort -s s -l stable -d (N_ "Stabilize sort")
-complete -c sort -s S -l buffer-size -r -d (N_ "Set memory buffer size")
-complete -c sort -s t -l field-separator -d (N_ "Field separator")
-complete -c sort -s T -l temporary-directory -r -d (N_ "Set temporary directory")
-complete -c sort -s u -l unique -d (N_ "Output only first of equal lines")
-complete -c sort -s z -l zero-terminated -d (N_ "Lines end with 0 byte")
-complete -c sort -l help -d (N_ "Display help and exit")
-complete -c sort -l version -d (N_ "Display version and exit")
+complete -c sort -s b -l ignore-leading-blanks --description "Ignore leading blanks"
+complete -c sort -s d -l dictionary-order --description "Consider only blanks and alphanumerics"
+complete -c sort -s f -l ignore-case --description "Ignore case"
+complete -c sort -s g -l general-numeric-sort --description "Compare general numeric value"
+complete -c sort -s i -l ignore-nonprinting --description "Consider only printable"
+complete -c sort -s M -l month-sort --description "Compare month names"
+complete -c sort -s n -l numeric-sort --description "Compare string numerical value"
+complete -c sort -s r -l reverse --description "Reverse results"
+complete -c sort -s c -l check --description "Only check if sorted"
+complete -c sort -s k -l key --description "Define key"
+complete -c sort -s m -l merge --description "Merge sorted files"
+complete -c sort -s o -l output -f --description "Write to file"
+complete -c sort -s s -l stable --description "Stabilize sort"
+complete -c sort -s S -l buffer-size -r --description "Set memory buffer size"
+complete -c sort -s t -l field-separator --description "Field separator"
+complete -c sort -s T -l temporary-directory -r --description "Set temporary directory"
+complete -c sort -s u -l unique --description "Output only first of equal lines"
+complete -c sort -s z -l zero-terminated --description "Lines end with 0 byte"
+complete -c sort -l help --description "Display help and exit"
+complete -c sort -l version --description "Display version and exit"
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index 57250e9e..637f8e49 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -16,30 +16,30 @@ complete -x -c ssh -d Hostname -a "
(__fish_print_users)@
"
-complete -c ssh -s a -d (N_ "Disables forwarding of the authentication agent")
-complete -c ssh -s A -d (N_ "Enables forwarding of the authentication agent")
-complete -x -c ssh -s b -d (N_ "Interface to transmit from") -a "
+complete -c ssh -s a --description "Disables forwarding of the authentication agent"
+complete -c ssh -s A --description "Enables forwarding of the authentication agent"
+complete -x -c ssh -s b --description "Interface to transmit from" -a "
(
cat /proc/net/arp ^/dev/null| sgrep -v '^IP'|cut -d ' ' -f 1 ^/dev/null
)
"
-complete -x -c ssh -s e -d (N_ "Escape character") -a "\^ none"
-complete -c ssh -s f -d (N_ "Go to background")
-complete -c ssh -s g -d (N_ "Allow remote host to connect to local forwarded ports")
-complete -c ssh -s I -d (N_ "Smartcard device")
-complete -c ssh -s k -d (N_ "Disable forwarding of Kerberos tickets")
-complete -c ssh -s l -x -a "(__fish_complete_users)" -d (N_ "User")
-complete -c ssh -s m -d (N_ "MAC algorithm")
-complete -c ssh -s n -d (N_ "Prevent reading from stdin")
-complete -c ssh -s N -d (N_ "Do not execute remote command")
-complete -c ssh -s p -x -d (N_ "Port")
-complete -c ssh -s q -d (N_ "Quiet mode")
-complete -c ssh -s s -d (N_ "Subsystem")
-complete -c ssh -s t -d (N_ "Force pseudo-tty allocation")
-complete -c ssh -s T -d (N_ "Disable pseudo-tty allocation")
-complete -c ssh -s x -d (N_ "Disable X11 forwarding")
-complete -c ssh -s X -d (N_ "Enable X11 forwarding")
-complete -c ssh -s L -d (N_ "Locally forwarded ports")
-complete -c ssh -s R -d (N_ "Remotely forwarded ports")
-complete -c ssh -s D -d (N_ "Dynamic port forwarding")
+complete -x -c ssh -s e --description "Escape character" -a "\^ none"
+complete -c ssh -s f --description "Go to background"
+complete -c ssh -s g --description "Allow remote host to connect to local forwarded ports"
+complete -c ssh -s I --description "Smartcard device"
+complete -c ssh -s k --description "Disable forwarding of Kerberos tickets"
+complete -c ssh -s l -x -a "(__fish_complete_users)" --description "User"
+complete -c ssh -s m --description "MAC algorithm"
+complete -c ssh -s n --description "Prevent reading from stdin"
+complete -c ssh -s N --description "Do not execute remote command"
+complete -c ssh -s p -x --description "Port"
+complete -c ssh -s q --description "Quiet mode"
+complete -c ssh -s s --description "Subsystem"
+complete -c ssh -s t --description "Force pseudo-tty allocation"
+complete -c ssh -s T --description "Disable pseudo-tty allocation"
+complete -c ssh -s x --description "Disable X11 forwarding"
+complete -c ssh -s X --description "Enable X11 forwarding"
+complete -c ssh -s L --description "Locally forwarded ports"
+complete -c ssh -s R --description "Remotely forwarded ports"
+complete -c ssh -s D --description "Dynamic port forwarding"
diff --git a/share/completions/sshfs.fish b/share/completions/sshfs.fish
index c9785bde..6c742b9c 100644
--- a/share/completions/sshfs.fish
+++ b/share/completions/sshfs.fish
@@ -17,17 +17,17 @@ complete -x -c sshfs -d Hostname -a "
#
# Mount Points, for neatness, I am only mounting under ~/mnt/
#
-complete -c sshfs -d (N_ "Mount point") -x -a '(find ~/mnt -type d)'
+complete -c sshfs --description "Mount point" -x -a '(find ~/mnt -type d)'
#
# Command options
#
-complete -c sshfs -s V -d (N_ "Display version and exit")
-complete -c sshfs -s p -x -d (N_ "Port")
-complete -c sshfs -s C -d (N_ "Compression")
-complete -c sshfs -s o -x -d (N_ "Mount options")
-complete -c sshfs -s d -d (N_ "Enable debug")
-complete -c sshfs -s f -d (N_ "Foreground operation")
-complete -c sshfs -s s -d (N_ "Disable multi-threaded operation")
-complete -c sshfs -s r -d (N_ "Mount options")
-complete -c sshfs -s h -d (N_ "Display help and exit")
+complete -c sshfs -s V --description "Display version and exit"
+complete -c sshfs -s p -x --description "Port"
+complete -c sshfs -s C --description "Compression"
+complete -c sshfs -s o -x --description "Mount options"
+complete -c sshfs -s d --description "Enable debug"
+complete -c sshfs -s f --description "Foreground operation"
+complete -c sshfs -s s --description "Disable multi-threaded operation"
+complete -c sshfs -s r --description "Mount options"
+complete -c sshfs -s h --description "Display help and exit"
diff --git a/share/completions/status.fish b/share/completions/status.fish
index 0055128f..3228ce05 100644
--- a/share/completions/status.fish
+++ b/share/completions/status.fish
@@ -1,11 +1,11 @@
complete -c status -s h -l help -d (N_ "Display help and exit" )
-complete -c status -l is-command-substitution -d (N_ "Test if a command substitution is currently evaluated")
-complete -c status -l is-block -d (N_ "Test if a code block is currently evaluated")
-complete -c status -l is-interactive -d (N_ "Test if this is an interactive shell")
-complete -c status -l is-login -d (N_ "Test if this is a login shell")
-complete -c status -l is-full-job-control -d (N_ "Test if all new jobs are put under job control")
-complete -c status -l is-interactive-job-control -d (N_ "Test if only interactive new jobs are put under job control")
-complete -c status -l is-no-job-control -d (N_ "Test if new jobs are never put under job control")
-complete -c status -s j -l job-control -xa "full interactive none" -d (N_ "Set which jobs are out under job control")
-complete -c status -s t -l print-stack-trace -d (N_ "Print a list of all function calls leading up to running the current command")
+complete -c status -l is-command-substitution --description "Test if a command substitution is currently evaluated"
+complete -c status -l is-block --description "Test if a code block is currently evaluated"
+complete -c status -l is-interactive --description "Test if this is an interactive shell"
+complete -c status -l is-login --description "Test if this is a login shell"
+complete -c status -l is-full-job-control --description "Test if all new jobs are put under job control"
+complete -c status -l is-interactive-job-control --description "Test if only interactive new jobs are put under job control"
+complete -c status -l is-no-job-control --description "Test if new jobs are never put under job control"
+complete -c status -s j -l job-control -xa "full interactive none" --description "Set which jobs are out under job control"
+complete -c status -s t -l print-stack-trace --description "Print a list of all function calls leading up to running the current command"
diff --git a/share/completions/su.fish b/share/completions/su.fish
index 6520e288..c75a617e 100644
--- a/share/completions/su.fish
+++ b/share/completions/su.fish
@@ -1,12 +1,12 @@
# Completions for su
complete -x -c su -a "(__fish_complete_users)"
-complete -c su -s l -l login -d (N_ "Make login shell")
-complete -r -c su -s c -l command -d (N_ "Pass command to shell") -xa "(__fish_complete_command)"
-complete -c su -s f -l fast -d (N_ "Pass -f to the shell")
-complete -c su -s m -l preserve_environment -d (N_ "Preserve environment")
-complete -c su -s p -d (N_ "Preserve environment")
+complete -c su -s l -l login --description "Make login shell"
+complete -r -c su -s c -l command --description "Pass command to shell" -xa "(__fish_complete_command)"
+complete -c su -s f -l fast --description "Pass -f to the shell"
+complete -c su -s m -l preserve_environment --description "Preserve environment"
+complete -c su -s p --description "Preserve environment"
complete -x -c su -s s -l shell -a "(cat /etc/shells)"
-complete -c su -l help -d (N_ "Display help and exit")
-complete -c su -l version -d (N_ "Display version and exit")
+complete -c su -l help --description "Display help and exit"
+complete -c su -l version --description "Display version and exit"
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index b497e8bd..fb77838f 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -2,7 +2,7 @@
# Completion for sudo
#
-complete -c sudo -d (N_ "Command to run") -x -a '(__fish_complete_subcommand_root)'
+complete -c sudo --description "Command to run" -x -a '(__fish_complete_subcommand_root)'
-complete -c sudo -s h -n "__fish_no_arguments" -d (N_ "Display help and exit")
-complete -c sudo -s v -n "__fish_no_arguments" -d (N_ "Validate")
+complete -c sudo -s h -n "__fish_no_arguments" --description "Display help and exit"
+complete -c sudo -s v -n "__fish_no_arguments" --description "Validate"
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index 0bea9281..ae89ed07 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -34,95 +34,95 @@ complete -c svn -n '__fish_use_subcommand' -xa 'update\t"'(_ "Bring changes from
complete -c svn -n '__fish_use_subcommand' -xa 'help\t"'(_ "Describe the usage of this program or its subcommands")'"'
# -s/--revision
-complete -c svn -n '__fish_seen_subcommand_from blame cat checkout info list log merge move propdel propedit propget proplist switch update' -x -s r -l revision -d (N_ "Specify revision")
+complete -c svn -n '__fish_seen_subcommand_from blame cat checkout info list log merge move propdel propedit propget proplist switch update' -x -s r -l revision --description "Specify revision"
# --targets
-complete -c svn -n '__fish_seen_subcommand_from add commit import info lock log resolved revert unlock' -r -l targets -d (N_ "Pass contents of file as additional args")
+complete -c svn -n '__fish_seen_subcommand_from add commit import info lock log resolved revert unlock' -r -l targets --description "Pass contents of file as additional args"
# -N/--non-recursive
-complete -c svn -n '__fish_seen_subcommand_from add checkout commit import merge status switch update' -s N -l non-recursive -d (N_ "Don't recurse")
+complete -c svn -n '__fish_seen_subcommand_from add checkout commit import merge status switch update' -s N -l non-recursive --description "Don't recurse"
# -q/--quiet
-complete -c svn -n '__fish_seen_subcommand_from add checkout commit import log merge mkdir move propdel proplist resolved revert status switch update help' -s q -l quiet -d (N_ "Print as little as possible")
+complete -c svn -n '__fish_seen_subcommand_from add checkout commit import log merge mkdir move propdel proplist resolved revert status switch update help' -s q -l quiet --description "Print as little as possible"
# --force
-complete -c svn -n '__fish_seen_subcommand_from add lock merge move propedit unlock' -l force -d (N_ "Force operation to run")
+complete -c svn -n '__fish_seen_subcommand_from add lock merge move propedit unlock' -l force --description "Force operation to run"
# --auto-props
-complete -c svn -n '__fish_seen_subcommand_from add' -l auto-props -d (N_ "Enable automatic properties")
+complete -c svn -n '__fish_seen_subcommand_from add' -l auto-props --description "Enable automatic properties"
# --no-auto-props
-complete -c svn -n '__fish_seen_subcommand_from add' -l no-auto-props -d (N_ "Disable automatic properties")
+complete -c svn -n '__fish_seen_subcommand_from add' -l no-auto-props --description "Disable automatic properties"
# -v/--verbose
-complete -c svn -n '__fish_seen_subcommand_from blame cat log proplist status' -s v -l verbose -d (N_ "Print extra info")
+complete -c svn -n '__fish_seen_subcommand_from blame cat log proplist status' -s v -l verbose --description "Print extra info"
# --username
-complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -x -l username -d (N_ "Specify a username")
+complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -x -l username --description "Specify a username"
# --password
-complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -x -l password -d (N_ "Specify a password")
+complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -x -l password --description "Specify a password"
# --no-auth-cache
-complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -l no-auth-cache -d (N_ "Don't cache auth tokens")
+complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -l no-auth-cache --description "Don't cache auth tokens"
# --non-interactive
-complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -l non-interactive -d (N_ "Do no interactive prompting")
+complete -c svn -n '__fish_seen_subcommand_from blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist status switch unlock update' -l non-interactive --description "Do no interactive prompting"
# --config-dir
-complete -c svn -n '__fish_seen_subcommand_from add cleanup blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist resolved revert status switch unlock update help' -r -l config-dir -d (N_ "Read user config files from named directory")
+complete -c svn -n '__fish_seen_subcommand_from add cleanup blame cat checkout commit import info list lock log merge mkdir move propdel propedit propget proplist resolved revert status switch unlock update help' -r -l config-dir --description "Read user config files from named directory"
# --no-unlock
-complete -c svn -n '__fish_seen_subcommand_from commit import' -l no-unlock -d (N_ "Don't unlock targets")
+complete -c svn -n '__fish_seen_subcommand_from commit import' -l no-unlock --description "Don't unlock targets"
# -m/--message
-complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -x -s m -l message -d (N_ "Specify commit message")
+complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -x -s m -l message --description "Specify commit message"
# -F/--file
-complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -r -s F -l file -d (N_ "Read commit message from file")
+complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -r -s F -l file --description "Read commit message from file"
# --force-log
-complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -l force-log -d (N_ "Force log message source validity")
+complete -c svn -n '__fish_seen_subcommand_from commit import lock mkdir move' -l force-log --description "Force log message source validity"
# --editor-cmd
-complete -c svn -n '__fish_seen_subcommand_from commit import mkdir move propedit' -x -l editor-cmd -d (N_ "Specify external editor")
+complete -c svn -n '__fish_seen_subcommand_from commit import mkdir move propedit' -x -l editor-cmd --description "Specify external editor"
# --recursive
-complete -c svn -n '__fish_seen_subcommand_from info list propdel propget proplist resolved revert' -s R -l recursive -d (N_ "Descend recursively")
+complete -c svn -n '__fish_seen_subcommand_from info list propdel propget proplist resolved revert' -s R -l recursive --description "Descend recursively"
# --incremental
-complete -c svn -n '__fish_seen_subcommand_from list log' -l incremental -d (N_ "Give output suitable for concatenation")
+complete -c svn -n '__fish_seen_subcommand_from list log' -l incremental --description "Give output suitable for concatenation"
# --xml
-complete -c svn -n '__fish_seen_subcommand_from list log' -l xml -d (N_ "Output in XML")
+complete -c svn -n '__fish_seen_subcommand_from list log' -l xml --description "Output in XML"
# --diff3-cmd
-complete -c svn -n '__fish_seen_subcommand_from cleanup merge switch update' -x -l diff3-cmd -d (N_ "Specify merge command")
+complete -c svn -n '__fish_seen_subcommand_from cleanup merge switch update' -x -l diff3-cmd --description "Specify merge command"
# --encoding
-complete -c svn -n '__fish_seen_subcommand_from lock mkdir move propedit' -x -l encoding -d (N_ "Force encoding")
+complete -c svn -n '__fish_seen_subcommand_from lock mkdir move propedit' -x -l encoding --description "Force encoding"
# --revprop
-complete -c svn -n '__fish_seen_subcommand_from propdel propedit propget' -l revprop -d (N_ "Operate on revision property")
+complete -c svn -n '__fish_seen_subcommand_from propdel propedit propget' -l revprop --description "Operate on revision property"
# --strict
-complete -c svn -n '__fish_seen_subcommand_from propget' -l strict -d (N_ "Use strict semantics")
+complete -c svn -n '__fish_seen_subcommand_from propget' -l strict --description "Use strict semantics"
# --ignore-externals
-complete -c svn -n '__fish_seen_subcommand_from checkout status update' -l ignore-externals -d (N_ "Ignore externals definitions")
+complete -c svn -n '__fish_seen_subcommand_from checkout status update' -l ignore-externals --description "Ignore externals definitions"
#
# Flags for svn log
#
set -l logopt -c svn -n 'contains log (commandline -poc)'
-complete $logopt -l stop-on-copy -d (N_ "Do not cross copies")
-complete $logopt -l limit -d (N_ "Maximum number of log entries")
+complete $logopt -l stop-on-copy --description "Do not cross copies"
+complete $logopt -l limit --description "Maximum number of log entries"
#
# Flags for svn merge
#
set -l mergeopt -c svn -n 'contains merge (commandline -poc)'
-complete $mergeopt -l dry-run -d (N_ "Make no changes")
-complete $mergeopt -l ignore-ancestry -d (N_ "Ignore ancestry when calculating merge")
+complete $mergeopt -l dry-run --description "Make no changes"
+complete $mergeopt -l ignore-ancestry --description "Ignore ancestry when calculating merge"
#
# Flags for svn status
#
set -l statusopt -c svn -n 'contains status (commandline -poc)'
-complete $statusopt -s u -l show-updates -d (N_ "Display update information")
-complete $statusopt -l no-ignore -d (N_ "Disregard ignores")
+complete $statusopt -s u -l show-updates --description "Display update information"
+complete $statusopt -l no-ignore --description "Disregard ignores"
#
# Flags for svn switch
#
set -l switchopt -c svn -n 'contains switch (commandline -poc)'
-complete $switchopt -l relocate -d (N_ "Relocate VIA URL-rewriting")
+complete $switchopt -l relocate --description "Relocate VIA URL-rewriting"
#
# Flags for svn help
#
set -l helpopt -c svn -n 'contains help (commandline -poc)'
-complete $helpopt -l version -d (N_ "Print client version info")
+complete $helpopt -l version --description "Print client version info"
#
# Flags for svn delete
#
set -l deleteopt -c svn -n 'contains delete (commandline -poc)'
-complete $deleteopt -l force -d (N_ "force operation to run")
-complete $deleteopt -s q -l quiet -d (N_ "print as little as possible")
-complete $deleteopt -l targets -d (N_ "pass contents of file ARG as additional args")
+complete $deleteopt -l force --description "force operation to run"
+complete $deleteopt -s q -l quiet --description "print as little as possible"
+complete $deleteopt -l targets --description "pass contents of file ARG as additional args"
diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index b8188593..070b16c8 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -2,65 +2,65 @@
# Peek inside of archives and list all files
complete -c tar -a "(__fish_complete_tar)"
-complete -c tar -s A -l catenate -d (N_ "Append archive to archive")
-complete -c tar -l concatenate -d (N_ "Append archive to archive")
-complete -c tar -s c -l create -d (N_ "Create archive")
-complete -c tar -s d -l diff -d (N_ "Compare archive and filesystem")
-complete -c tar -l compare -d (N_ "Compare archive and filesystem")
-complete -c tar -l delete -d (N_ "Delete from archive")
-complete -c tar -s r -l append -d (N_ "Append files to archive")
-complete -c tar -s t -l list -d (N_ "List archive")
-complete -c tar -s u -l update -d (N_ "Append new files")
-complete -c tar -s x -l extract -d (N_ "Extract from archive")
-complete -c tar -l get -d (N_ "Extract from archive")
-complete -c tar -l atime-preserve -d (N_ "Keep access time")
-complete -c tar -s b -l block-size -d (N_ "Block size")
-complete -c tar -s B -l read-full-blocks -d (N_ "Reblock while reading")
-complete -c tar -s C -l directory -r -d (N_ "Change directory")
-complete -c tar -l checkpoint -d (N_ "Print directory names")
-complete -c tar -s f -l file -r -d (N_ "Archive file")
-complete -c tar -l force-local -d (N_ "Archive is local")
-complete -c tar -s F -l info-script -d (N_ "Run script at end of tape")
-complete -c tar -s G -l incremental -d (N_ "Use old incremental GNU format")
-complete -c tar -s g -l listed-incremental -d (N_ "Use new incremental GNU format")
-complete -c tar -s h -l dereference -d (N_ "Dereference symlinks")
-complete -c tar -s i -l ignore-zeros -d (N_ "Ignore zero block in archive")
-complete -c tar -s j -l bzip -d (N_ "Filter through bzip2")
-complete -c tar -l ignore-failed-read -d (N_ "Don't exit on unreadable files")
-complete -c tar -s k -l keep-old-files -d (N_ "Don't overwrite")
-complete -c tar -s K -l starting-file -r -d (N_ "Starting file in archive")
-complete -c tar -s l -l one-file-system -d (N_ "Stay in local filesystem")
-complete -c tar -s L -l tape-length -r -d (N_ "Tape length")
-complete -c tar -s m -l modification-time -d (N_ "Don't extract modification time")
-complete -c tar -s M -l multi-volume -d (N_ "Multi volume archive")
-complete -c tar -s N -l after-date -r -d (N_ "Only store newer files")
-complete -c tar -s o -l old-archive -d (N_ "Use V7 format")
-complete -c tar -l portability -d (N_ "Use V7 format")
-complete -c tar -s O -l to-stdout -d (N_ "Extract to stdout")
-complete -c tar -s p -l same-permissions -d (N_ "Extract all permissions")
-complete -c tar -l preserve-permissions -d (N_ "Extract all permissions")
-complete -c tar -s P -l absolute-paths -d (N_ "Don't strip leading /")
-complete -c tar -l preserve -d (N_ "Preserve all permissions and do not sort file arguments")
-complete -c tar -s R -l record-number -d (N_ "Show record number")
-complete -c tar -l remove-files -d (N_ "Remove files after adding to archive")
-complete -c tar -s s -l same-order -d (N_ "Do not sort file arguments")
-complete -c tar -l preserve-order -d (N_ "Do not sort file arguments")
-complete -c tar -l same-owner -d (N_ "Preserve file ownership")
-complete -c tar -s S -l sparse -d (N_ "Handle sparse files")
-complete -c tar -s T -l files-from -r -d (N_ "Extract file from file")
-complete -c tar -l null -d (N_ "-T has null-terminated names")
-complete -c tar -l totals -d (N_ "Print total bytes written")
-complete -c tar -s v -l verbose -d (N_ "Verbose mode")
-complete -c tar -s V -l label -r -d (N_ "Set volume name")
-complete -c tar -l version -d (N_ "Display version and exit")
-complete -c tar -s w -l interactive -d (N_ "Ask for confirmation")
-complete -c tar -l confirmation -d (N_ "Ask for confirmation")
-complete -c tar -s W -l vevrify -d (N_ "Verify archive")
-complete -c tar -l exclude -r -d (N_ "Exclude file")
-complete -c tar -s X -l exclude-from -r -d (N_ "Exclude files listed in specified file")
-complete -c tar -s Z -l compress -d (N_ "Filter through compress")
-complete -c tar -l uncompress -d (N_ "Filter through compress")
-complete -c tar -s z -l gzip -d (N_ "Filter through gzip")
-complete -c tar -l gunzip -d (N_ "Filter through gzip")
-complete -c tar -l use-compress-program -r -d (N_ "Filter through specified program")
+complete -c tar -s A -l catenate --description "Append archive to archive"
+complete -c tar -l concatenate --description "Append archive to archive"
+complete -c tar -s c -l create --description "Create archive"
+complete -c tar -s d -l diff --description "Compare archive and filesystem"
+complete -c tar -l compare --description "Compare archive and filesystem"
+complete -c tar -l delete --description "Delete from archive"
+complete -c tar -s r -l append --description "Append files to archive"
+complete -c tar -s t -l list --description "List archive"
+complete -c tar -s u -l update --description "Append new files"
+complete -c tar -s x -l extract --description "Extract from archive"
+complete -c tar -l get --description "Extract from archive"
+complete -c tar -l atime-preserve --description "Keep access time"
+complete -c tar -s b -l block-size --description "Block size"
+complete -c tar -s B -l read-full-blocks --description "Reblock while reading"
+complete -c tar -s C -l directory -r --description "Change directory"
+complete -c tar -l checkpoint --description "Print directory names"
+complete -c tar -s f -l file -r --description "Archive file"
+complete -c tar -l force-local --description "Archive is local"
+complete -c tar -s F -l info-script --description "Run script at end of tape"
+complete -c tar -s G -l incremental --description "Use old incremental GNU format"
+complete -c tar -s g -l listed-incremental --description "Use new incremental GNU format"
+complete -c tar -s h -l dereference --description "Dereference symlinks"
+complete -c tar -s i -l ignore-zeros --description "Ignore zero block in archive"
+complete -c tar -s j -l bzip --description "Filter through bzip2"
+complete -c tar -l ignore-failed-read --description "Don't exit on unreadable files"
+complete -c tar -s k -l keep-old-files --description "Don't overwrite"
+complete -c tar -s K -l starting-file -r --description "Starting file in archive"
+complete -c tar -s l -l one-file-system --description "Stay in local filesystem"
+complete -c tar -s L -l tape-length -r --description "Tape length"
+complete -c tar -s m -l modification-time --description "Don't extract modification time"
+complete -c tar -s M -l multi-volume --description "Multi volume archive"
+complete -c tar -s N -l after-date -r --description "Only store newer files"
+complete -c tar -s o -l old-archive --description "Use V7 format"
+complete -c tar -l portability --description "Use V7 format"
+complete -c tar -s O -l to-stdout --description "Extract to stdout"
+complete -c tar -s p -l same-permissions --description "Extract all permissions"
+complete -c tar -l preserve-permissions --description "Extract all permissions"
+complete -c tar -s P -l absolute-paths --description "Don't strip leading /"
+complete -c tar -l preserve --description "Preserve all permissions and do not sort file arguments"
+complete -c tar -s R -l record-number --description "Show record number"
+complete -c tar -l remove-files --description "Remove files after adding to archive"
+complete -c tar -s s -l same-order --description "Do not sort file arguments"
+complete -c tar -l preserve-order --description "Do not sort file arguments"
+complete -c tar -l same-owner --description "Preserve file ownership"
+complete -c tar -s S -l sparse --description "Handle sparse files"
+complete -c tar -s T -l files-from -r --description "Extract file from file"
+complete -c tar -l null --description "-T has null-terminated names"
+complete -c tar -l totals --description "Print total bytes written"
+complete -c tar -s v -l verbose --description "Verbose mode"
+complete -c tar -s V -l label -r --description "Set volume name"
+complete -c tar -l version --description "Display version and exit"
+complete -c tar -s w -l interactive --description "Ask for confirmation"
+complete -c tar -l confirmation --description "Ask for confirmation"
+complete -c tar -s W -l vevrify --description "Verify archive"
+complete -c tar -l exclude -r --description "Exclude file"
+complete -c tar -s X -l exclude-from -r --description "Exclude files listed in specified file"
+complete -c tar -s Z -l compress --description "Filter through compress"
+complete -c tar -l uncompress --description "Filter through compress"
+complete -c tar -s z -l gzip --description "Filter through gzip"
+complete -c tar -l gunzip --description "Filter through gzip"
+complete -c tar -l use-compress-program -r --description "Filter through specified program"
diff --git a/share/completions/test.fish b/share/completions/test.fish
index 569721e0..5ce76809 100644
--- a/share/completions/test.fish
+++ b/share/completions/test.fish
@@ -1,39 +1,39 @@
-complete -c test -l help -d (N_ "Display help and exit")
-complete -c test -l version -d (N_ "Display version and exit")
-complete -c test -a ! -d (N_ "Negate expression")
-complete -c test -s a -d (N_ "Logical and")
-complete -c test -s o -d (N_ "Logical or")
-complete -c test -s n -d (N_ "String length is non-zero")
-complete -c test -s z -d (N_ "String length is zero")
-complete -c test -a = -d (N_ "Strings are equal")
-complete -c test -a != -d (N_ "Strings are not equal")
-complete -c test -o eq -d (N_ "Integers are equal")
-complete -c test -o ge -d (N_ "Left integer larger than or equal to right integer")
-complete -c test -o gt -d (N_ "Left integer larger than right integer")
-complete -c test -o le -d (N_ "Left integer less than or equal to right integer")
-complete -c test -o lt -d (N_ "Left integer less than right integer")
-complete -c test -o ne -d (N_ "Left integer not equal to right integer")
-complete -c test -o ef -d (N_ "Left file equal to right file")
-complete -c test -o nt -d (N_ "Left file newer than right file")
-complete -c test -o ot -d (N_ "Left file older than right file")
-complete -c test -s b -d (N_ "File is block device")
-complete -c test -s c -d (N_ "File is character device")
-complete -c test -s d -d (N_ "File is directory")
-complete -c test -s e -d (N_ "File exists")
-complete -c test -s f -d (N_ "File is regular")
-complete -c test -s g -d (N_ "File is set-group-ID")
-complete -c test -s h -d (N_ "File is symlink")
-complete -c test -s G -d (N_ "File owned by effective group ID")
-complete -c test -s k -d (N_ "File has sticky bit set")
-complete -c test -s L -d (N_ "File is symlink")
-complete -c test -s O -d (N_ "File owned by effective user ID")
-complete -c test -s p -d (N_ "File is named pipe")
-complete -c test -s r -d (N_ "File is readable")
-complete -c test -s s -d (N_ "File size is non-zero")
-complete -c test -s S -d (N_ "File is socket")
-complete -c test -s t -d (N_ "FD is terminal")
-complete -c test -s u -d (N_ "File set-user-ID bit is set")
-complete -c test -s w -d (N_ "File is writable")
-complete -c test -s x -d (N_ "File is executable")
+complete -c test -l help --description "Display help and exit"
+complete -c test -l version --description "Display version and exit"
+complete -c test -a ! --description "Negate expression"
+complete -c test -s a --description "Logical and"
+complete -c test -s o --description "Logical or"
+complete -c test -s n --description "String length is non-zero"
+complete -c test -s z --description "String length is zero"
+complete -c test -a = --description "Strings are equal"
+complete -c test -a != --description "Strings are not equal"
+complete -c test -o eq --description "Integers are equal"
+complete -c test -o ge --description "Left integer larger than or equal to right integer"
+complete -c test -o gt --description "Left integer larger than right integer"
+complete -c test -o le --description "Left integer less than or equal to right integer"
+complete -c test -o lt --description "Left integer less than right integer"
+complete -c test -o ne --description "Left integer not equal to right integer"
+complete -c test -o ef --description "Left file equal to right file"
+complete -c test -o nt --description "Left file newer than right file"
+complete -c test -o ot --description "Left file older than right file"
+complete -c test -s b --description "File is block device"
+complete -c test -s c --description "File is character device"
+complete -c test -s d --description "File is directory"
+complete -c test -s e --description "File exists"
+complete -c test -s f --description "File is regular"
+complete -c test -s g --description "File is set-group-ID"
+complete -c test -s h --description "File is symlink"
+complete -c test -s G --description "File owned by effective group ID"
+complete -c test -s k --description "File has sticky bit set"
+complete -c test -s L --description "File is symlink"
+complete -c test -s O --description "File owned by effective user ID"
+complete -c test -s p --description "File is named pipe"
+complete -c test -s r --description "File is readable"
+complete -c test -s s --description "File size is non-zero"
+complete -c test -s S --description "File is socket"
+complete -c test -s t --description "FD is terminal"
+complete -c test -s u --description "File set-user-ID bit is set"
+complete -c test -s w --description "File is writable"
+complete -c test -s x --description "File is executable"
diff --git a/share/completions/time.fish b/share/completions/time.fish
index 4c1b4000..61b8ea56 100644
--- a/share/completions/time.fish
+++ b/share/completions/time.fish
@@ -1,11 +1,11 @@
-complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d (N_ "Command")
+complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" --description "Command"
-complete -c time -s f -l format -n "__fish_no_arguments" -d (N_ "Specify output format") -x
-complete -c time -s p -l portable -n "__fish_no_arguments" -d (N_ "Use the portable output format")
-complete -c time -s o -l output -n "__fish_no_arguments" -d (N_ "Do not send the results to stderr, but overwrite the specified file") -r
-complete -c time -s a -l append -n "__fish_no_arguments" -d (N_ "(Used together with -o) Do not overwrite but append")
-complete -c time -s v -l verbose -n "__fish_no_arguments" -d (N_ "Verbose mode")
-complete -c time -l help -n "__fish_no_arguments" -d (N_ "Display help and exit")
-complete -c time -s V -l version -n "__fish_no_arguments" -d (N_ "Display version and exit")
+complete -c time -s f -l format -n "__fish_no_arguments" --description "Specify output format" -x
+complete -c time -s p -l portable -n "__fish_no_arguments" --description "Use the portable output format"
+complete -c time -s o -l output -n "__fish_no_arguments" --description "Do not send the results to stderr, but overwrite the specified file" -r
+complete -c time -s a -l append -n "__fish_no_arguments" --description "(Used together with -o) Do not overwrite but append"
+complete -c time -s v -l verbose -n "__fish_no_arguments" --description "Verbose mode"
+complete -c time -l help -n "__fish_no_arguments" --description "Display help and exit"
+complete -c time -s V -l version -n "__fish_no_arguments" --description "Display version and exit"
diff --git a/share/completions/top.fish b/share/completions/top.fish
index b03f47b5..8b5a6b75 100644
--- a/share/completions/top.fish
+++ b/share/completions/top.fish
@@ -1,14 +1,14 @@
# Completions for top
-complete -c top -s b -d (N_ "Batch mode")
-complete -c top -s c -d (N_ "Toggle command line/program name")
-complete -c top -s d -d (N_ "Update interval") -x
-complete -c top -s h -d (N_ "Display help and exit")
-complete -c top -s i -d (N_ "Toggle idle processes")
-complete -c top -s n -d (N_ "Maximium iterations") -x
-complete -c top -s u -d (N_ "Monitor effective UID") -x -a "(__fish_complete_users)"
-complete -c top -s U -d (N_ "Monitor user") -x -a "(__fish_complete_users)"
-complete -c top -s p -d (N_ "Monitor PID") -x -a "(__fish_complete_pids)"
-complete -c top -s s -d (N_ "Secure mode")
-complete -c top -s S -d (N_ "Cumulative mode")
-complete -c top -s v -d (N_ "Display version and exit")
+complete -c top -s b --description "Batch mode"
+complete -c top -s c --description "Toggle command line/program name"
+complete -c top -s d --description "Update interval" -x
+complete -c top -s h --description "Display help and exit"
+complete -c top -s i --description "Toggle idle processes"
+complete -c top -s n --description "Maximium iterations" -x
+complete -c top -s u --description "Monitor effective UID" -x -a "(__fish_complete_users)"
+complete -c top -s U --description "Monitor user" -x -a "(__fish_complete_users)"
+complete -c top -s p --description "Monitor PID" -x -a "(__fish_complete_pids)"
+complete -c top -s s --description "Secure mode"
+complete -c top -s S --description "Cumulative mode"
+complete -c top -s v --description "Display version and exit"
diff --git a/share/completions/touch.fish b/share/completions/touch.fish
index d4560638..981581ac 100644
--- a/share/completions/touch.fish
+++ b/share/completions/touch.fish
@@ -1,11 +1,11 @@
-complete -c touch -s a -d (N_ "Change access time")
-complete -c touch -s B -l backward -x -d (N_ "Set date back")
-complete -c touch -s c -l no-create -d (N_ "Do not create file")
-complete -c touch -s d -l date -x -d (N_ "Set date")
-complete -c touch -s f -l forward -x -d (N_ "Set date forward")
-complete -c touch -s m -d (N_ "Change modification time")
-complete -c touch -s r -l reference -d (N_ "Use this files times")
-complete -c touch -s t -d (N_ "Set date")
-complete -c touch -l time -x -d (N_ "Set time")
-complete -c touch -l help -d (N_ "Display help and exit")
-complete -c touch -l version -d (N_ "Display version and exit")
+complete -c touch -s a --description "Change access time"
+complete -c touch -s B -l backward -x --description "Set date back"
+complete -c touch -s c -l no-create --description "Do not create file"
+complete -c touch -s d -l date -x --description "Set date"
+complete -c touch -s f -l forward -x --description "Set date forward"
+complete -c touch -s m --description "Change modification time"
+complete -c touch -s r -l reference --description "Use this files times"
+complete -c touch -s t --description "Set date"
+complete -c touch -l time -x --description "Set time"
+complete -c touch -l help --description "Display help and exit"
+complete -c touch -l version --description "Display version and exit"
diff --git a/share/completions/trap.fish b/share/completions/trap.fish
index 3f560bf2..20b6d9ec 100644
--- a/share/completions/trap.fish
+++ b/share/completions/trap.fish
@@ -1,4 +1,4 @@
-complete -c trap -s l -l list-signals -d (N_ 'Display names of all signals')
-complete -c trap -s p -l print -d (N_ 'Display all currently defined trap handlers')
-complete -c trap -s h -l help -d (N_ 'Display help and exit')
+complete -c trap -s l -l list-signals --description 'Display names of all signals'
+complete -c trap -s p -l print --description 'Display all currently defined trap handlers'
+complete -c trap -s h -l help --description 'Display help and exit'
diff --git a/share/completions/type.fish b/share/completions/type.fish
index d50760a0..c568fe06 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -1,12 +1,12 @@
-complete -c type -s h -l help -d (N_ "Display help and exit")
-complete -c type -s a -l all -d (N_ "Print all possible definitions of the specified name")
-complete -c type -s f -l no-functions -d (N_ "Supress function and builtin lookup")
-complete -c type -s t -l type -d (N_ "Print command type")
-complete -c type -s p -l path -d (N_ "Print path to command, or nothing if name is not a command")
-complete -c type -s P -l force-path -d (N_ "Print path to command")
+complete -c type -s h -l help --description "Display help and exit"
+complete -c type -s a -l all --description "Print all possible definitions of the specified name"
+complete -c type -s f -l no-functions --description "Supress function and builtin lookup"
+complete -c type -s t -l type --description "Print command type"
+complete -c type -s p -l path --description "Print path to command, or nothing if name is not a command"
+complete -c type -s P -l force-path --description "Print path to command"
-complete -c type -a "(builtin -n)" -d (N_ "Builtin")
-complete -c type -a "(functions -n)" -d (N_ "Function")
+complete -c type -a "(builtin -n)" --description "Builtin"
+complete -c type -a "(functions -n)" --description "Function"
complete -c type -a "(commandline -ct)(complete -C(commandline -ct))" -x
diff --git a/share/completions/ulimit.fish b/share/completions/ulimit.fish
index 02cc39ce..669163f7 100644
--- a/share/completions/ulimit.fish
+++ b/share/completions/ulimit.fish
@@ -1,19 +1,19 @@
-complete -c ulimit -s S -l soft -d (N_ "Set or get soft limit")
-complete -c ulimit -s H -l hard -d (N_ "Set or get hard limit")
+complete -c ulimit -s S -l soft --description "Set or get soft limit"
+complete -c ulimit -s H -l hard --description "Set or get hard limit"
-complete -c ulimit -s a -l all -d (N_ "Set or get all current limits")
-complete -c ulimit -s c -l core-size -d (N_ "Maximum size of core files created")
-complete -c ulimit -s d -l data-size -d (N_ "Maximum size of a process's data segment")
-complete -c ulimit -s f -l file-size -d (N_ "Maximum size of files created by the shell")
-complete -c ulimit -s l -l lock-size -d (N_ "Maximum size that may be locked into memory")
-complete -c ulimit -s m -l resident-set-size -d (N_ "Maximum resident set size")
-complete -c ulimit -s n -l file-descriptor-count -d (N_ "Maximum number of open file descriptors")
-complete -c ulimit -s s -l stack-size -d (N_ "Maximum stack size")
-complete -c ulimit -s t -l cpu-time -d (N_ "Maximum amount of cpu time in seconds")
-complete -c ulimit -s u -l process-count -d (N_ "Maximum number of processes available to a single user")
-complete -c ulimit -s v -l virtual-memory-size -d (N_ "Maximum amount of virtual memory available to the shell")
+complete -c ulimit -s a -l all --description "Set or get all current limits"
+complete -c ulimit -s c -l core-size --description "Maximum size of core files created"
+complete -c ulimit -s d -l data-size --description "Maximum size of a process's data segment"
+complete -c ulimit -s f -l file-size --description "Maximum size of files created by the shell"
+complete -c ulimit -s l -l lock-size --description "Maximum size that may be locked into memory"
+complete -c ulimit -s m -l resident-set-size --description "Maximum resident set size"
+complete -c ulimit -s n -l file-descriptor-count --description "Maximum number of open file descriptors"
+complete -c ulimit -s s -l stack-size --description "Maximum stack size"
+complete -c ulimit -s t -l cpu-time --description "Maximum amount of cpu time in seconds"
+complete -c ulimit -s u -l process-count --description "Maximum number of processes available to a single user"
+complete -c ulimit -s v -l virtual-memory-size --description "Maximum amount of virtual memory available to the shell"
-complete -c ulimit -s h -l help -d (N_ "Display help and exit")
+complete -c ulimit -s h -l help --description "Display help and exit"
-complete -c ulimit -a "unlimited soft hard" -d (N_ "New resource limit")
+complete -c ulimit -a "unlimited soft hard" --description "New resource limit"
diff --git a/share/completions/umount.fish b/share/completions/umount.fish
index 339bef1a..1705ddcf 100644
--- a/share/completions/umount.fish
+++ b/share/completions/umount.fish
@@ -5,18 +5,18 @@
#
# Find all mountpoints
#
-complete -c umount -d (N_ "Mount point") -x -a '(cat /etc/mtab | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/")'
+complete -c umount --description "Mount point") -x -a '(cat /etc/mtab | cut -d " " -f 1-2|tr " " \n|sed -e "s/[0-9\.]*:\//\//"|sgrep "^/"'
-complete -c umount -s V -d (N_ "Display version and exit")
-complete -c umount -s h -d (N_ "Display help and exit")
-complete -c umount -s v -d (N_ "Verbose mode")
-complete -c umount -s n -d (N_ "Unmount without writing in /etc/mtab")
-complete -c umount -s r -d (N_ "In case unmounting fails, try to remount read-only")
-complete -c umount -s d -d (N_ "In case the unmounted device was a loop device, also free this loop device")
-complete -c umount -s i -d (N_ "Don't call the /sbin/umount.<filesystem> helper even if it exists")
-complete -c umount -s a -d (N_ "Unmount all of the file systems described in /etc/mtab")
-complete -c umount -s t -d (N_ "Actions should only be taken on file systems of the specified type") -xa "(__fish_print_filesystems)"
-complete -c umount -s O -d (N_ "Actions should only be taken on file systems with the specified options in /etc/fstab") -xa '(cat /etc/mtab | cut -d " " -f 4)\t"Mount option"'
-complete -c umount -s f -d (N_ "Force unmount (in case of an unreachable NFS system)")
-complete -c umount -s l -d (N_ "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy")
+complete -c umount -s V --description "Display version and exit"
+complete -c umount -s h --description "Display help and exit"
+complete -c umount -s v --description "Verbose mode"
+complete -c umount -s n --description "Unmount without writing in /etc/mtab"
+complete -c umount -s r --description "In case unmounting fails, try to remount read-only"
+complete -c umount -s d --description "In case the unmounted device was a loop device, also free this loop device"
+complete -c umount -s i --description "Don't call the /sbin/umount.<filesystem> helper even if it exists"
+complete -c umount -s a --description "Unmount all of the file systems described in /etc/mtab"
+complete -c umount -s t --description "Actions should only be taken on file systems of the specified type" -xa "(__fish_print_filesystems)"
+complete -c umount -s O --description "Actions should only be taken on file systems with the specified options in /etc/fstab" -xa '(cat /etc/mtab | cut -d " " -f 4)\t"Mount option"'
+complete -c umount -s f --description "Force unmount (in case of an unreachable NFS system)"
+complete -c umount -s l --description "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy"
diff --git a/share/completions/uname.fish b/share/completions/uname.fish
index 2ae9bd87..d67124a3 100644
--- a/share/completions/uname.fish
+++ b/share/completions/uname.fish
@@ -1,11 +1,11 @@
-complete -c uname -s a -l all -d (N_ "Print all information")
-complete -c uname -s s -l kernel-name -d (N_ "Print kernel name")
-complete -c uname -s n -l nodename -d (N_ "Print network node hostname")
-complete -c uname -s r -l kernel-release -d (N_ "Print kernel release")
-complete -c uname -s v -l kernel-version -d (N_ "Print kernel version")
-complete -c uname -s m -l machine -d (N_ "Print machine name")
-complete -c uname -s p -l processor -d (N_ "Print processor")
-complete -c uname -s i -l hardware-platform -d (N_ "Print hardware platform")
-complete -c uname -s o -l operating-system -d (N_ "Print operating system")
-complete -c uname -l help -d (N_ "Display help and exit")
-complete -c uname -l verion -d (N_ "Display version and exit")
+complete -c uname -s a -l all --description "Print all information"
+complete -c uname -s s -l kernel-name --description "Print kernel name"
+complete -c uname -s n -l nodename --description "Print network node hostname"
+complete -c uname -s r -l kernel-release --description "Print kernel release"
+complete -c uname -s v -l kernel-version --description "Print kernel version"
+complete -c uname -s m -l machine --description "Print machine name"
+complete -c uname -s p -l processor --description "Print processor"
+complete -c uname -s i -l hardware-platform --description "Print hardware platform"
+complete -c uname -s o -l operating-system --description "Print operating system"
+complete -c uname -l help --description "Display help and exit"
+complete -c uname -l verion --description "Display version and exit"
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index d68daba9..0027d71f 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -1,15 +1,15 @@
-complete -c uniq -s c -l count -d (N_ "Print number of occurences")
-complete -c uniq -s d -l repeated -d (N_ "Only print duplicates")
-complete -c uniq -s D -l all-repeated -d (N_ "Remove non-duplicate lines") -f -x -a "
+complete -c uniq -s c -l count --description "Print number of occurences"
+complete -c uniq -s d -l repeated --description "Only print duplicates"
+complete -c uniq -s D -l all-repeated --description "Remove non-duplicate lines" -f -x -a "
none\t'Remove none-duplicate lines'
prepend\t'Remove non-duplicate lines and print an empty line before each non-duplicate'
separate\t'Remove non-duplicate lines and print an empty line between each non-duplicate'
"
-complete -c uniq -s f -l skip-fields -d (N_ "Avoid comparing first N fields") -r
-complete -c uniq -s i -l ignore-case -d (N_ "Case insensitive")
-complete -c uniq -s s -l skip-chars -d (N_ "Avoid comparing first N characters") -r
-complete -c uniq -s u -l unique -d (N_ "Only print unique lines")
-complete -c uniq -s w -l check-chars -d (N_ "Compare only specified number of characters") -r
-complete -c uniq -l help -d (N_ "Display help and exit")
-complete -c uniq -l version -d (N_ "Display version and exit")
+complete -c uniq -s f -l skip-fields --description "Avoid comparing first N fields" -r
+complete -c uniq -s i -l ignore-case --description "Case insensitive"
+complete -c uniq -s s -l skip-chars --description "Avoid comparing first N characters" -r
+complete -c uniq -s u -l unique --description "Only print unique lines"
+complete -c uniq -s w -l check-chars --description "Compare only specified number of characters" -r
+complete -c uniq -l help --description "Display help and exit"
+complete -c uniq -l version --description "Display version and exit"
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 6e7b5755..f4a11026 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -9,7 +9,7 @@ else
set -g skin tool
end
-complete -xc valgrind -l $skin -d (N_ "Skin") -a "
+complete -xc valgrind -l $skin --description "Skin" -a "
memcheck\tHeavyweight\ memory\ checker
cachegrind\tCache-miss\ profiler
addrcheck\tLightweight\ memory\ checker
@@ -21,54 +21,54 @@ eval "function __fish_valgrind_skin; contains -- --$skin=\$argv (commandline -cp
set -e $skin
-complete -c valgrind -l help -d (N_ "Display help and exit")
-complete -c valgrind -l help-debug -d (N_ "Display help and debug options")
-complete -c valgrind -l version -d (N_ "Display version and exit")
-complete -c valgrind -s q -l quiet -d (N_ "Quiet mode")
-complete -c valgrind -s v -l verbose -d (N_ "Verbose mode")
-complete -xc valgrind -l trace-children -d (N_ "Valgrind-ise children") -a "yes no"
-complete -xc valgrind -l track-fds -d (N_ "Track file descriptors") -a "yes no"
-complete -xc valgrind -l logfile-fd -d (N_ "Log to file descriptor") -a "0 1 2 3 4 5 6 7 8 9"
-complete -rc valgrind -l logfile -d (N_ "Log to file")
-complete -xc valgrind -l logsocket -d (N_ "Log to socket")
+complete -c valgrind -l help --description "Display help and exit"
+complete -c valgrind -l help-debug --description "Display help and debug options"
+complete -c valgrind -l version --description "Display version and exit"
+complete -c valgrind -s q -l quiet --description "Quiet mode"
+complete -c valgrind -s v -l verbose --description "Verbose mode"
+complete -xc valgrind -l trace-children --description "Valgrind-ise children" -a "yes no"
+complete -xc valgrind -l track-fds --description "Track file descriptors" -a "yes no"
+complete -xc valgrind -l logfile-fd --description "Log to file descriptor" -a "0 1 2 3 4 5 6 7 8 9"
+complete -rc valgrind -l logfile --description "Log to file"
+complete -xc valgrind -l logsocket --description "Log to socket"
complete -c valgrind -l demangle -xd "Demangle C++ names" -a "yes no"
-complete -xc valgrind -l num-callers -d (N_ "Callers in stack trace")
-complete -xc valgrind -l error-limit -d (N_ "Stop showing errors if too many") -a "yes no"
-complete -xc valgrind -l show-below-main -d (N_ "Continue trace below main()") -a "yes no"
-complete -rc valgrind -l supressions -d (N_ "Supress errors from file")
-complete -c valgrind -l gen-supressions -d (N_ "Print suppressions for detected errors")
-complete -xc valgrind -l db-attach -d (N_ "Start debugger on error") -a "yes no"
-complete -rc valgrind -l db-command -d (N_ "Debugger command")
-complete -xc valgrind -l input-fd -d (N_ "File descriptor for input") -a "0 1 2 3 4 5 6 7 8 9"
+complete -xc valgrind -l num-callers --description "Callers in stack trace"
+complete -xc valgrind -l error-limit --description "Stop showing errors if too many" -a "yes no"
+complete -xc valgrind -l show-below-main --description "Continue trace below main()" -a "yes no"
+complete -rc valgrind -l supressions --description "Supress errors from file"
+complete -c valgrind -l gen-supressions --description "Print suppressions for detected errors"
+complete -xc valgrind -l db-attach --description "Start debugger on error" -a "yes no"
+complete -rc valgrind -l db-command --description "Debugger command"
+complete -xc valgrind -l input-fd --description "File descriptor for input" -a "0 1 2 3 4 5 6 7 8 9"
# Memcheck-specific options
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-check -d (N_ "Check for memory leaks") -a "no\tDon\'t\ check\ for\ memory\ leaks summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l show-reachable -d (N_ "Show reachable leaked memory") -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-resolution -d (N_ "Determines how willing Memcheck is to consider different backtraces to be the same") -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
-complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l freelist-vol -d (N_ "Set size of freed memory pool")
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-check --description "Check for memory leaks" -a "no\tDon\'t\ check\ for\ memory\ leaks summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l show-reachable --description "Show reachable leaked memory" -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l leak-resolution --description "Determines how willing Memcheck is to consider different backtraces to be the same" -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
+complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l freelist-vol --description "Set size of freed memory pool"
complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l partial-loads-ok -d 'How to handle loads of words that are partially addressible' -a 'yes\t"Do not emit errors on partial loads" no\t"Emit errors on partial loads"'
complete -n "__fish_valgrind_skin memcheck" -xc valgrind -l avoid-strlen-errors -d 'Whether to skip error reporting for the strlen function' -a 'yes no'
# Addrcheck-specific options
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-check -d (N_ "Check for memory leaks") -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l show-reachable -d (N_ "Show reachable leaked memory") -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-resolution -d (N_ "Determines how willing Addrcheck is to consider different backtraces to be the same") -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
-complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l freelist-vol -d (N_ "Set size of freed memory pool")
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-check --description "Check for memory leaks" -a "no\t'Do not check for memory leaks' summary\t'Show a leak summary' full\t'Describe memory leaks in detail'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l show-reachable --description "Show reachable leaked memory" -a "yes\t'Show reachable leaked memory' no\t'Do not show reachable leaked memory'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l leak-resolution --description "Determines how willing Addrcheck is to consider different backtraces to be the same" -a "low\t'Two entries need to match' med\t'Four entries need to match' high\t'All entries need to match'"
+complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l freelist-vol --description "Set size of freed memory pool"
complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l partial-loads-ok -d 'How to handle loads of words that are partially addressible' -a 'yes\t"Do not emit errors on partial loads" no\t"Emit errors on partial loads"'
complete -n "__fish_valgrind_skin addrcheck" -xc valgrind -l avoid-strlen-errors -d 'Whether to skip error reporting for the strlen function' -a 'yes no'
# Cachegrind-specific options
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l I1 -d (N_ "Type of L1 instruction cache")
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l D1 -d (N_ "Type of L1 data cache")
-complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l L2 -d (N_ "Type of L2 cache")
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l I1 --description "Type of L1 instruction cache"
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l D1 --description "Type of L1 data cache"
+complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l L2 --description "Type of L2 cache"
# Massif-specific options
-complete -c valgrind -n "__fish_valgrind_skin massif" -l alloc-fn -d (N_ "Specify a function that allocates memory") -x -a "(__fish_print_function_prototypes)"
+complete -c valgrind -n "__fish_valgrind_skin massif" -l alloc-fn --description "Specify a function that allocates memory" -x -a "(__fish_print_function_prototypes)"
complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap -d 'Profile heap usage' -a 'yes\t"Profile heap usage" no\t"Do not profile heap usage"'
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap-admin -d (N_ "The number of bytes of heap overhead per allocation")
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l stacks -d (N_ "Profile stack usage") -a 'yes\t"Profile stack usage" no\t"Do not profile stack usage"'
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l depth -d (N_ "Depth of call chain")
-complete -c valgrind -n "__fish_valgrind_skin massif" -x -l format -d (N_ "Profiling output format") -a "html\t'Produce html output' text\t'Produce text output'"
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap-admin --description "The number of bytes of heap overhead per allocation"
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l stacks --description "Profile stack usage" -a 'yes\t"Profile stack usage" no\t"Do not profile stack usage"'
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l depth --description "Depth of call chain"
+complete -c valgrind -n "__fish_valgrind_skin massif" -x -l format --description "Profiling output format" -a "html\t'Produce html output' text\t'Produce text output'"
diff --git a/share/completions/vared.fish b/share/completions/vared.fish
index 76b92abe..e2c3112f 100644
--- a/share/completions/vared.fish
+++ b/share/completions/vared.fish
@@ -1,3 +1,3 @@
complete -c vared -x -a "(set|sed -e 's/ /'\t'Variable: /')"
-complete -c vared -s h -l help -d (N_ "Display help and exit")
+complete -c vared -s h -l help --description "Display help and exit"
diff --git a/share/completions/w.fish b/share/completions/w.fish
index a7c7a2d4..78a41657 100644
--- a/share/completions/w.fish
+++ b/share/completions/w.fish
@@ -1,6 +1,6 @@
-complete -c w -s h -d (N_ "Dont print header")
-complete -c w -s u -d (N_ "Ignore username for time calculations")
-complete -c w -s s -d (N_ "Short format")
-complete -c w -s f -d (N_ "Toggle printing of remote hostname")
-complete -c w -s V -d (N_ "Display version and exit")
-complete -c w -x -a "(__fish_complete_users)" -d (N_ "Username")
+complete -c w -s h --description "Dont print header"
+complete -c w -s u --description "Ignore username for time calculations"
+complete -c w -s s --description "Short format"
+complete -c w -s f --description "Toggle printing of remote hostname"
+complete -c w -s V --description "Display version and exit"
+complete -c w -x -a "(__fish_complete_users)" --description "Username"
diff --git a/share/completions/wajig.fish b/share/completions/wajig.fish
index 5b7d8e82..36591595 100644
--- a/share/completions/wajig.fish
+++ b/share/completions/wajig.fish
@@ -1,4 +1,4 @@
-function __fish_wajig_no_subcommand -d (N_ 'Test if wajig has yet to be given the subcommand')
+function __fish_wajig_no_subcommand --description 'Test if wajig has yet to be given the subcommand'
for i in (commandline -opc)
if contains -- $i addcdrom auto-alts auto-clean auto-download auto-install available bug build build-depend changelog clean commands daily-upgrade dependents describe describe-new detail detail-new dist-upgrade docs download file-download file-install file-remove find-file find-pkg fix-configure fix-install fix-missing force help hold init install installr installrs installs integrity large last-update list list-all list-alts list-cache list-commands list-daemons list-files list-hold list-installed list-log list-names list-orphans list-scripts list-section list-section list-status list-wide local-dist-upgrade local-upgrade madison move new news new-upgrades non-free orphans package policy purge purge-depend purge-orphans readme recursive recommended reconfigure reinstall reload remove remove-depend remove-orphans repackage reset restart rpminstall rpmtodeb search search-apt setup show showdistupgrade showinstall showremove showupgrade size sizes snapshot source start status status-match status-search stop suggested tasksel toupgrade unhold unofficial update update-alts update-pci-ids update-usb-ids upgrade versions whatis whichpkg
return 1
@@ -7,7 +7,7 @@ function __fish_wajig_no_subcommand -d (N_ 'Test if wajig has yet to be given th
return 0
end
-function __fish_wajig_use_package -d (N_ 'Test if wajig command should have packages as potential completion')
+function __fish_wajig_use_package --description 'Test if wajig command should have packages as potential completion'
for i in (commandline -opc)
if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
return 0
@@ -16,12 +16,12 @@ function __fish_wajig_use_package -d (N_ 'Test if wajig command should have pack
return 1
end
-complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' -d (N_ 'Package')h
-complete -c wajig -s q -l quiet -d (N_ 'Do system commands everything quietly.')
-complete -c wajig -s n -l noauth -d (N_ 'Allow packages from unathenticated archives.')
-complete -c wajig -s s -l simulate -d (N_ 'Trace but don\'t execute the sequence of underlying commands.')
-complete -c wajig -s t -l teaching -d (N_ 'Trace the sequence of commands performed.')
-complete -c wajig -s y -l yes -d (N_ 'Assume yes for any questions asked.')
+complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' --description 'Package'h
+complete -c wajig -s q -l quiet --description 'Do system commands everything quietly.'
+complete -c wajig -s n -l noauth --description 'Allow packages from unathenticated archives.'
+complete -c wajig -s s -l simulate --description 'Trace but don\'t execute the sequence of underlying commands.'
+complete -c wajig -s t -l teaching --description 'Trace the sequence of commands performed.'
+complete -c wajig -s y -l yes --description 'Assume yes for any questions asked.'
complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'addcdrom' -d(N_ 'Add a CD-ROM to the list of available sources of packages')
complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-alts' -d(N_ 'Mark the alternative to be auto set (using set priorities)')
complete -f -n '__fish_wajig_no_subcommand' -c wajig -a 'auto-clean' -d(N_ 'Remove superseded deb files from the download cache')
diff --git a/share/completions/wc.fish b/share/completions/wc.fish
index feef1745..0da7597e 100644
--- a/share/completions/wc.fish
+++ b/share/completions/wc.fish
@@ -1,7 +1,7 @@
-complete -c wc -s c -l bytes -d (N_ "Print byte counts")
-complete -c wc -s m -l chars -d (N_ "Print character counts")
-complete -c wc -s l -l lines -d (N_ "Print newline counts")
-complete -c wc -s L -l max-line-length -d (N_ "Print length of longest line")
-complete -c wc -s w -l words -d (N_ "Print word counts")
-complete -c wc -l help -d (N_ "Display help and exit")
-complete -c wc -l version -d (N_ "Display version and exit")
+complete -c wc -s c -l bytes --description "Print byte counts"
+complete -c wc -s m -l chars --description "Print character counts"
+complete -c wc -s l -l lines --description "Print newline counts"
+complete -c wc -s L -l max-line-length --description "Print length of longest line"
+complete -c wc -s w -l words --description "Print word counts"
+complete -c wc -l help --description "Display help and exit"
+complete -c wc -l version --description "Display version and exit"
diff --git a/share/completions/wget.fish b/share/completions/wget.fish
index 710291e1..bcf10ce9 100644
--- a/share/completions/wget.fish
+++ b/share/completions/wget.fish
@@ -2,112 +2,112 @@
# Completions for the wget command
#
-complete -c wget -s V -l version -d (N_ "Display version and exit")
-complete -c wget -s h -l help -d (N_ "Display help and exit")
-complete -c wget -s b -l background -d (N_ "Go to background immediately after startup")
-complete -c wget -s e -l execute -d (N_ "Execute command as if part of .wgetrc") -x
-complete -c wget -s o -l output-file -d (N_ "Log all messages to logfile") -r
-complete -c wget -s a -l append-output -d (N_ "Append all messages to logfile")
-complete -c wget -s d -l debug -d (N_ "Turn on debug output")
-complete -c wget -s q -l quiet -d (N_ "Quiet mode")
-complete -c wget -s v -l verbose -d (N_ "Verbose mode")
-complete -c wget -l non-verbose -d (N_ "Turn off verbose without being completely quiet")
-complete -c wget -o nv -d (N_ "Turn off verbose without being completely quiet")
-complete -c wget -s i -l input-file -d (N_ "Read URLs from file") -r
-complete -c wget -s F -l force-html -d (N_ "Force input to be treated as HTML")
-complete -c wget -s B -l base -d (N_ "Prepend string to relative links") -x
-complete -c wget -l bind-adress -d (N_ "Bind address on local machine") -xa "(__fish_print_addresses; __fish_print_hostnames)"
-complete -c wget -s t -l tries -d (N_ "Set number of retries to number") -xa "0 1 2 4 8 16 32 64 128"
-complete -c wget -s O -l output-document -d (N_ "Concatenate output to file") -r
-complete -c wget -l no-clobber -d (N_ "Never overwrite files with same name")
-complete -c wget -o nc -d (N_ "Never overwrite files with same name")
-complete -c wget -s c -l continue -d (N_ "Continue getting a partially-downloaded file")
-complete -c wget -l progress -d (N_ "Select progress meter type") -a "
+complete -c wget -s V -l version --description "Display version and exit"
+complete -c wget -s h -l help --description "Display help and exit"
+complete -c wget -s b -l background --description "Go to background immediately after startup"
+complete -c wget -s e -l execute --description "Execute command as if part of .wgetrc" -x
+complete -c wget -s o -l output-file --description "Log all messages to logfile" -r
+complete -c wget -s a -l append-output --description "Append all messages to logfile"
+complete -c wget -s d -l debug --description "Turn on debug output"
+complete -c wget -s q -l quiet --description "Quiet mode"
+complete -c wget -s v -l verbose --description "Verbose mode"
+complete -c wget -l non-verbose --description "Turn off verbose without being completely quiet"
+complete -c wget -o nv --description "Turn off verbose without being completely quiet"
+complete -c wget -s i -l input-file --description "Read URLs from file" -r
+complete -c wget -s F -l force-html --description "Force input to be treated as HTML"
+complete -c wget -s B -l base --description "Prepend string to relative links" -x
+complete -c wget -l bind-adress --description "Bind address on local machine" -xa "(__fish_print_addresses; __fish_print_hostnames)"
+complete -c wget -s t -l tries --description "Set number of retries to number" -xa "0 1 2 4 8 16 32 64 128"
+complete -c wget -s O -l output-document --description "Concatenate output to file" -r
+complete -c wget -l no-clobber --description "Never overwrite files with same name"
+complete -c wget -o nc --description "Never overwrite files with same name"
+complete -c wget -s c -l continue --description "Continue getting a partially-downloaded file"
+complete -c wget -l progress --description "Select progress meter type" -a "
dot\t'Print one dot for every kB of data, 50 dots per line'
dot:default\t'Print one dot for every kB of data, 50 dots per line'
dot:binary\t'Print one dot for every 8 kB of data, 48 dots per line'
dot:mega\t'Print one dot for every 64 kB of data, 48 dots per line'
bar\t'Print progress bar'
"
-complete -c wget -s N -l timestamping -d (N_ "Turn on time-stamping")
-complete -c wget -s S -l server-response -d (N_ "Print the headers/responses sent by servers")
-complete -c wget -l spider -d (N_ "Do not download the pages, just check that they are there")
-complete -c wget -s T -l timeout -d (N_ "Set the network timeout") -x
-complete -c wget -l dns-timeout -d (N_ "Set the DNS lookup timeout") -x
-complete -c wget -l connect-timeout -d (N_ "Set the connect timeout") -x
-complete -c wget -l read-timeout -d (N_ "Set the read (and write) timeout") -x
-complete -c wget -l limit-rate -d (N_ "Limit the download speed") -x
-complete -c wget -s w -l wait -d (N_ "Wait the specified number of seconds between the retrievals") -x
-complete -c wget -l waitretry -d (N_ "Wait time between retries") -x
-complete -c wget -l random-wait -d (N_ "Wait random amount of time between retrievals")
-complete -c wget -s Y -l proxy -d (N_ "Toggle proxy support") -xa "on off"
-complete -c wget -s Q -l quota -d (N_ "Specify download quota for automatic retrievals") -x
-complete -c wget -l dns-cache -d (N_ "Turn off caching of DNS lookups") -xa "off"
-complete -c wget -l restrict-file-names -d (N_ "Change which characters found in remote URLs may show up in local file names") -a "
+complete -c wget -s N -l timestamping --description "Turn on time-stamping"
+complete -c wget -s S -l server-response --description "Print the headers/responses sent by servers"
+complete -c wget -l spider --description "Do not download the pages, just check that they are there"
+complete -c wget -s T -l timeout --description "Set the network timeout" -x
+complete -c wget -l dns-timeout --description "Set the DNS lookup timeout" -x
+complete -c wget -l connect-timeout --description "Set the connect timeout" -x
+complete -c wget -l read-timeout --description "Set the read (and write) timeout" -x
+complete -c wget -l limit-rate --description "Limit the download speed" -x
+complete -c wget -s w -l wait --description "Wait the specified number of seconds between the retrievals" -x
+complete -c wget -l waitretry --description "Wait time between retries" -x
+complete -c wget -l random-wait --description "Wait random amount of time between retrievals"
+complete -c wget -s Y -l proxy --description "Toggle proxy support" -xa "on off"
+complete -c wget -s Q -l quota --description "Specify download quota for automatic retrievals" -x
+complete -c wget -l dns-cache --description "Turn off caching of DNS lookups" -xa "off"
+complete -c wget -l restrict-file-names --description "Change which characters found in remote URLs may show up in local file names" -a "
unix\t'Escape slash and non-printing characters'
windows\t'Escape most non-alphabetical characters'
"
# HTTP options
-complete -c wget -l no-directories -d (N_ "Do not create a hierarchy of directories")
-complete -c wget -o nd -d (N_ "Do not create a hierarchy of directories")
-complete -c wget -s x -l force-directories -d (N_ "Force creation of a hierarchy of directories")
-complete -c wget -l no-host-directories -d (N_ "Disable generation of host-prefixed directories")
-complete -c wget -o nH -d (N_ "Disable generation of host-prefixed directories")
-complete -c wget -l protocal-directories -d (N_ "Use the protocol name as a directory component")
-complete -c wget -l cut-dirs -d (N_ "Ignore specified number of directory components") -xa "1 2 3 4 5"
-complete -c wget -s P -l directory-prefix -d (N_ "Set directory prefix") -r
-complete -c wget -s E -l html-extension -d (N_ "Force html files to have html extension")
-complete -c wget -l http-user -d (N_ "Specify the http username") -xa "(__fish_complete_users)"
-complete -c wget -l http-passwd -d (N_ "Specify the http password") -x
-complete -c wget -l no-cache -d (N_ "Disable server-side cache")
-complete -c wget -l no-cookies -d (N_ "Disable the use of cookies")
-complete -c wget -l load-cookies -d (N_ "Load cookies from file") -r
-complete -c wget -l save-cookies -d (N_ "Save cookies to file")
-complete -c wget -l keep-session-cookies -d (N_ "Save session cookies")
-complete -c wget -l ignore-length -d (N_ "Ignore 'Content-Length' header")
-complete -c wget -l header -d (N_ "Define an additional-header to be passed to the HTTP servers") -x
-complete -c wget -l proxy-user -d (N_ "Specify the proxy username") -xa "(__fish_complete_users)"
-complete -c wget -l proxy-password -d (N_ "Specify the proxy password") -x
-complete -c wget -l referer -d (N_ "Set referer URL") -x
-complete -c wget -l save-headers -d (N_ "Save the headers sent by the HTTP server")
-complete -c wget -s U -l user-agent -d (N_ "Identify as agent-string") -x
-complete -c wget -l post-data -d (N_ "Use POST as the method for all HTTP requests and send the specified data in the request body") -x
-complete -c wget -l post-file -d (N_ "Use POST as the method for all HTTP requests and send the specified data in the request body") -r
-complete -c wget -l no-http-keep-alive -d (N_ "Turn off keep-alive for http downloads")
+complete -c wget -l no-directories --description "Do not create a hierarchy of directories"
+complete -c wget -o nd --description "Do not create a hierarchy of directories"
+complete -c wget -s x -l force-directories --description "Force creation of a hierarchy of directories"
+complete -c wget -l no-host-directories --description "Disable generation of host-prefixed directories"
+complete -c wget -o nH --description "Disable generation of host-prefixed directories"
+complete -c wget -l protocal-directories --description "Use the protocol name as a directory component"
+complete -c wget -l cut-dirs --description "Ignore specified number of directory components" -xa "1 2 3 4 5"
+complete -c wget -s P -l directory-prefix --description "Set directory prefix" -r
+complete -c wget -s E -l html-extension --description "Force html files to have html extension"
+complete -c wget -l http-user --description "Specify the http username" -xa "(__fish_complete_users)"
+complete -c wget -l http-passwd --description "Specify the http password" -x
+complete -c wget -l no-cache --description "Disable server-side cache"
+complete -c wget -l no-cookies --description "Disable the use of cookies"
+complete -c wget -l load-cookies --description "Load cookies from file" -r
+complete -c wget -l save-cookies --description "Save cookies to file"
+complete -c wget -l keep-session-cookies --description "Save session cookies"
+complete -c wget -l ignore-length --description "Ignore 'Content-Length' header"
+complete -c wget -l header --description "Define an additional-header to be passed to the HTTP servers" -x
+complete -c wget -l proxy-user --description "Specify the proxy username" -xa "(__fish_complete_users)"
+complete -c wget -l proxy-password --description "Specify the proxy password" -x
+complete -c wget -l referer --description "Set referer URL" -x
+complete -c wget -l save-headers --description "Save the headers sent by the HTTP server"
+complete -c wget -s U -l user-agent --description "Identify as agent-string" -x
+complete -c wget -l post-data --description "Use POST as the method for all HTTP requests and send the specified data in the request body" -x
+complete -c wget -l post-file --description "Use POST as the method for all HTTP requests and send the specified data in the request body" -r
+complete -c wget -l no-http-keep-alive --description "Turn off keep-alive for http downloads"
#FTP options
-complete -c wget -l no-remove-listing -d (N_ "Don't remove the temporary .listing files generated")
-complete -c wget -l no-glob -d (N_ "Turn off FTP globbing")
-complete -c wget -l passive-ftp -d (N_ "Use the passive FTP retrieval scheme")
-complete -c wget -l retr-symlinks -d (N_ "Traverse symlinks and retrieve pointed-to files")
+complete -c wget -l no-remove-listing --description "Don't remove the temporary .listing files generated"
+complete -c wget -l no-glob --description "Turn off FTP globbing"
+complete -c wget -l passive-ftp --description "Use the passive FTP retrieval scheme"
+complete -c wget -l retr-symlinks --description "Traverse symlinks and retrieve pointed-to files"
# Recursive options
-complete -c wget -s r -l recursive -d (N_ "Turn on recursive retrieving")
-complete -c wget -n '__fish_contains_opt -s r recursive' -s l -l level -d (N_ "Specify recursion maximum depth") -x
-complete -c wget -l delete-after -d (N_ "Delete every single file downloaded")
-complete -c wget -s k -l convert-links -d (N_ "Convert the links in the document to make them suitable for local viewing")
-complete -c wget -s K -l backup-converted -d (N_ "Back up the original version")
-complete -c wget -s m -l mirror -d (N_ "Turn on options suitable for mirroring")
-complete -c wget -s p -l page-requisites -d (N_ "Download all the files that are necessary to properly display a given HTML page")
-complete -c wget -l strict-comments -d (N_ "Turn on strict parsing of HTML comments")
+complete -c wget -s r -l recursive --description "Turn on recursive retrieving"
+complete -c wget -n '__fish_contains_opt -s r recursive' -s l -l level --description "Specify recursion maximum depth" -x
+complete -c wget -l delete-after --description "Delete every single file downloaded"
+complete -c wget -s k -l convert-links --description "Convert the links in the document to make them suitable for local viewing"
+complete -c wget -s K -l backup-converted --description "Back up the original version"
+complete -c wget -s m -l mirror --description "Turn on options suitable for mirroring"
+complete -c wget -s p -l page-requisites --description "Download all the files that are necessary to properly display a given HTML page"
+complete -c wget -l strict-comments --description "Turn on strict parsing of HTML comments"
#Recursive accept/reject options
-complete -c wget -s A -l accept -d (N_ "Comma-separated lists of file name suffixes or patterns to accept") -x
-complete -c wget -s R -l reject -d (N_ "Comma-separated lists of file name suffixes or patterns to reject") -x
-complete -c wget -s D -l domains -d (N_ "Set domains to be followed") -x
-complete -c wget -l exclude-domains -d (N_ "Specify the domains that are not to be followed") -x
-complete -c wget -l follow-ftp -d (N_ "Follow FTP links from HTML documents")
-complete -c wget -l follow-tags -d (N_ "HTML tags to follow") -x
-complete -c wget -l ignore-tags -d (N_ "HTML tags to ignore") -x
-complete -c wget -s H -l span-hosts -d (N_ "Enable spanning across hosts")
-complete -c wget -s L -l relative -d (N_ "Follow relative links only")
-complete -c wget -s I -l include-directories -d (N_ "Specify a comma-separated list of directories you wish to follow") -x
-complete -c wget -s X -l exclude-directories -d (N_ "Specify a comma-separated list of directories you wish to exclude") -x
-complete -c wget -l no-parent -d (N_ "Do not ever ascend to the parent directory")
-complete -c wget -o np -d (N_ "Do not ever ascend to the parent directory")
+complete -c wget -s A -l accept --description "Comma-separated lists of file name suffixes or patterns to accept" -x
+complete -c wget -s R -l reject --description "Comma-separated lists of file name suffixes or patterns to reject" -x
+complete -c wget -s D -l domains --description "Set domains to be followed" -x
+complete -c wget -l exclude-domains --description "Specify the domains that are not to be followed" -x
+complete -c wget -l follow-ftp --description "Follow FTP links from HTML documents"
+complete -c wget -l follow-tags --description "HTML tags to follow" -x
+complete -c wget -l ignore-tags --description "HTML tags to ignore" -x
+complete -c wget -s H -l span-hosts --description "Enable spanning across hosts"
+complete -c wget -s L -l relative --description "Follow relative links only"
+complete -c wget -s I -l include-directories --description "Specify a comma-separated list of directories you wish to follow" -x
+complete -c wget -s X -l exclude-directories --description "Specify a comma-separated list of directories you wish to exclude" -x
+complete -c wget -l no-parent --description "Do not ever ascend to the parent directory"
+complete -c wget -o np --description "Do not ever ascend to the parent directory"
diff --git a/share/completions/which.fish b/share/completions/which.fish
index 16c1b7c4..2d392a1d 100644
--- a/share/completions/which.fish
+++ b/share/completions/which.fish
@@ -1,15 +1,15 @@
-complete -c which -s a -l all -d (N_ "Print all matching executables in PATH, not just the first")
-complete -c which -s i -l read-alias -d (N_ "Read aliases from stdin, reporting matching ones on stdout")
-complete -c which -l skip-alias -d (N_ "Ignore option '--read-alias'")
-complete -c which -l read-functions -d (N_ "Read shell function definitions from stdin, reporting matching ones on stdout")
-complete -c which -l skip-functions -d (N_ "Ignore option '--read-functions'")
-complete -c which -l skip-dot -d (N_ "Skip directories in PATH that start with a dot")
-complete -c which -l skip-tilde -d (N_ "Skip directories in PATH that start with a tilde and executables which reside in the HOME directory")
-complete -c which -l show-dot -d (N_ "If a directory in PATH starts with a dot and a matching executable was found for that path, then print './programname'")
-complete -c which -l show-tilde -d (N_ "Output a tilde when a directory matches the HOME directory")
-complete -c which -l tty-only -d (N_ "Stop processing options on the right if not on tty")
-complete -c which -s v -s V -l version -d (N_ "Display version and exit")
-complete -c which -l help -d (N_ "Display help and exit")
+complete -c which -s a -l all --description "Print all matching executables in PATH, not just the first"
+complete -c which -s i -l read-alias --description "Read aliases from stdin, reporting matching ones on stdout"
+complete -c which -l skip-alias --description "Ignore option '--read-alias'"
+complete -c which -l read-functions --description "Read shell function definitions from stdin, reporting matching ones on stdout"
+complete -c which -l skip-functions --description "Ignore option '--read-functions'"
+complete -c which -l skip-dot --description "Skip directories in PATH that start with a dot"
+complete -c which -l skip-tilde --description "Skip directories in PATH that start with a tilde and executables which reside in the HOME directory"
+complete -c which -l show-dot --description "If a directory in PATH starts with a dot and a matching executable was found for that path, then print './programname'"
+complete -c which -l show-tilde --description "Output a tilde when a directory matches the HOME directory"
+complete -c which -l tty-only --description "Stop processing options on the right if not on tty"
+complete -c which -s v -s V -l version --description "Display version and exit"
+complete -c which -l help --description "Display help and exit"
complete -c which -a "(commandline -ct)(complete -C(commandline -ct))" -x
diff --git a/share/completions/who.fish b/share/completions/who.fish
index 0add02e7..1b9b4155 100644
--- a/share/completions/who.fish
+++ b/share/completions/who.fish
@@ -1,20 +1,20 @@
-complete -c who -s a -l all -d (N_ "Same as -b -d --login -p -r -t -T -u")
-complete -c who -s b -l boot -d (N_ "Print time of last boot")
-complete -c who -s d -l dead -d (N_ "Print dead processes")
-complete -c who -s H -l heading -d (N_ "Print line of headings")
-complete -c who -s i -l idle -d (N_ "Print idle time")
-complete -c who -s l -l login -d (N_ "Print login process")
-complete -c who -l lookup -d (N_ "Canonicalize hostnames via DNS")
-complete -c who -s m -d (N_ "Print hostname and user for stdin")
-complete -c who -s p -l process -d (N_ "Print active processes spawned by init")
-complete -c who -s q -l count -d (N_ "Print all login names and number of users logged on")
-complete -c who -s r -l runlevel -d (N_ "Print current runlevel")
-complete -c who -s s -l short -d (N_ "Print name, line, and time")
-complete -c who -s t -l time -d (N_ "Print last system clock change")
-complete -c who -s T -l mesg -d (N_ "Print users message status as +, - or ?")
-complete -c who -s w -l writable -d (N_ "Print users message status as +, - or ?")
-complete -c who -l message -d (N_ "Print users message status as +, - or ?")
-complete -c who -s u -l users -d (N_ "List users logged in")
-complete -c who -l help -d (N_ "Display help and exit")
-complete -c who -l version -d (N_ "Display version and exit")
+complete -c who -s a -l all --description "Same as -b -d --login -p -r -t -T -u"
+complete -c who -s b -l boot --description "Print time of last boot"
+complete -c who -s d -l dead --description "Print dead processes"
+complete -c who -s H -l heading --description "Print line of headings"
+complete -c who -s i -l idle --description "Print idle time"
+complete -c who -s l -l login --description "Print login process"
+complete -c who -l lookup --description "Canonicalize hostnames via DNS"
+complete -c who -s m --description "Print hostname and user for stdin"
+complete -c who -s p -l process --description "Print active processes spawned by init"
+complete -c who -s q -l count --description "Print all login names and number of users logged on"
+complete -c who -s r -l runlevel --description "Print current runlevel"
+complete -c who -s s -l short --description "Print name, line, and time"
+complete -c who -s t -l time --description "Print last system clock change"
+complete -c who -s T -l mesg --description "Print users message status as +, - or ?"
+complete -c who -s w -l writable --description "Print users message status as +, - or ?"
+complete -c who -l message --description "Print users message status as +, - or ?"
+complete -c who -s u -l users --description "List users logged in"
+complete -c who -l help --description "Display help and exit"
+complete -c who -l version --description "Display version and exit"
diff --git a/share/completions/wpa_cli.fish b/share/completions/wpa_cli.fish
index 550cf0cd..7460c5c6 100644
--- a/share/completions/wpa_cli.fish
+++ b/share/completions/wpa_cli.fish
@@ -1,39 +1,39 @@
#completions for wpa_cli
-complete -x -c wpa_cli -a status -d (N_ 'get current WPA/EAPOL/EAP status')
-complete -x -c wpa_cli -a mib -d (N_ 'get MIB variables (dot1x, dot11)')
-complete -x -c wpa_cli -a help -d (N_ 'show this usage help')
-complete -x -c wpa_cli -a interface -d (N_ 'show interfaces/select interface')
-complete -x -c wpa_cli -a level -d (N_ 'change debug level')
-complete -x -c wpa_cli -a license -d (N_ 'show full wpa_cli license')
-complete -x -c wpa_cli -a logoff -d (N_ 'IEEE 802.1X EAPOL state machine logoff')
-complete -x -c wpa_cli -a logon -d (N_ 'IEEE 802.1X EAPOL state machine logon')
-complete -x -c wpa_cli -a set -d (N_ 'set/list variables')
-complete -x -c wpa_cli -a pmksa -d (N_ 'show PMKSA cache')
-complete -x -c wpa_cli -a reassociate -d (N_ 'force reassociation')
-complete -x -c wpa_cli -a reconfigure -d (N_ 'force wpa_supplicant to re-read its config file')
-complete -x -c wpa_cli -a preauthenticate -d (N_ 'force preauthentication')
-complete -x -c wpa_cli -a identity -d (N_ 'configure identity for an SSID')
-complete -x -c wpa_cli -a password -d (N_ 'configure password for an SSID')
-complete -x -c wpa_cli -a new_password -d (N_ 'change password for an SSID')
-complete -x -c wpa_cli -a pin -d (N_ 'configure pin for an SSID')
-complete -x -c wpa_cli -a otp -d (N_ 'configure one-time-password for an SSID')
-complete -x -c wpa_cli -a passphrase -d (N_ 'configure private key passphrase for an SSID')
-complete -x -c wpa_cli -a bssid -d (N_ 'set preferred BSSID for an SSID')
-complete -x -c wpa_cli -a list_networks -d (N_ 'list configured networks')
-complete -x -c wpa_cli -a select_network -d (N_ 'select a network (disable others)')
-complete -x -c wpa_cli -a enable_network -d (N_ 'enable a network')
-complete -x -c wpa_cli -a disable_network -d (N_ 'disable a network')
-complete -x -c wpa_cli -a add_network -d (N_ 'add a network')
-complete -x -c wpa_cli -a remove_network -d (N_ 'remove a network')
-complete -x -c wpa_cli -a set_network -d (N_ 'set/list network variables')
-complete -x -c wpa_cli -a get_network -d (N_ 'get network variables')
-complete -x -c wpa_cli -a save_config -d (N_ 'save the current configuration')
-complete -x -c wpa_cli -a disconnect -d (N_ 'disconnect and wait for reassociate command before connecting')
-complete -x -c wpa_cli -a scan -d (N_ 'request new BSS scan')
-complete -x -c wpa_cli -a scan_results -d (N_ 'get latest scan results')
-complete -x -c wpa_cli -a get_capability -d (N_ 'get capabilies')
-complete -x -c wpa_cli -a stakey-request -d (N_ 'request STAKey negotiation with <addr>')
-complete -x -c wpa_cli -a ap_scan -d (N_ 'set ap_scan parameter')
-complete -x -c wpa_cli -a stkstart -d (N_ 'request STK negotiation with <addr>')
-complete -x -c wpa_cli -a terminate -d (N_ 'terminate wpa_supplicant')
+complete -x -c wpa_cli -a status --description 'get current WPA/EAPOL/EAP status'
+complete -x -c wpa_cli -a mib --description 'get MIB variables (dot1x, dot11)'
+complete -x -c wpa_cli -a help --description 'show this usage help'
+complete -x -c wpa_cli -a interface --description 'show interfaces/select interface'
+complete -x -c wpa_cli -a level --description 'change debug level'
+complete -x -c wpa_cli -a license --description 'show full wpa_cli license'
+complete -x -c wpa_cli -a logoff --description 'IEEE 802.1X EAPOL state machine logoff'
+complete -x -c wpa_cli -a logon --description 'IEEE 802.1X EAPOL state machine logon'
+complete -x -c wpa_cli -a set --description 'set/list variables'
+complete -x -c wpa_cli -a pmksa --description 'show PMKSA cache'
+complete -x -c wpa_cli -a reassociate --description 'force reassociation'
+complete -x -c wpa_cli -a reconfigure --description 'force wpa_supplicant to re-read its config file'
+complete -x -c wpa_cli -a preauthenticate --description 'force preauthentication'
+complete -x -c wpa_cli -a identity --description 'configure identity for an SSID'
+complete -x -c wpa_cli -a password --description 'configure password for an SSID'
+complete -x -c wpa_cli -a new_password --description 'change password for an SSID'
+complete -x -c wpa_cli -a pin --description 'configure pin for an SSID'
+complete -x -c wpa_cli -a otp --description 'configure one-time-password for an SSID'
+complete -x -c wpa_cli -a passphrase --description 'configure private key passphrase for an SSID'
+complete -x -c wpa_cli -a bssid --description 'set preferred BSSID for an SSID'
+complete -x -c wpa_cli -a list_networks --description 'list configured networks'
+complete -x -c wpa_cli -a select_network --description 'select a network (disable others)'
+complete -x -c wpa_cli -a enable_network --description 'enable a network'
+complete -x -c wpa_cli -a disable_network --description 'disable a network'
+complete -x -c wpa_cli -a add_network --description 'add a network'
+complete -x -c wpa_cli -a remove_network --description 'remove a network'
+complete -x -c wpa_cli -a set_network --description 'set/list network variables'
+complete -x -c wpa_cli -a get_network --description 'get network variables'
+complete -x -c wpa_cli -a save_config --description 'save the current configuration'
+complete -x -c wpa_cli -a disconnect --description 'disconnect and wait for reassociate command before connecting'
+complete -x -c wpa_cli -a scan --description 'request new BSS scan'
+complete -x -c wpa_cli -a scan_results --description 'get latest scan results'
+complete -x -c wpa_cli -a get_capability --description 'get capabilies'
+complete -x -c wpa_cli -a stakey-request --description 'request STAKey negotiation with <addr>'
+complete -x -c wpa_cli -a ap_scan --description 'set ap_scan parameter'
+complete -x -c wpa_cli -a stkstart --description 'request STK negotiation with <addr>'
+complete -x -c wpa_cli -a terminate --description 'terminate wpa_supplicant'
diff --git a/share/completions/xargs.fish b/share/completions/xargs.fish
index 19231b44..9858ed55 100644
--- a/share/completions/xargs.fish
+++ b/share/completions/xargs.fish
@@ -2,19 +2,19 @@
#Completions for xargs
#
-complete -c xargs -s 0 -l null -d (N_ "Input filenames are terminated by a null character instead of by whitespace, and the quotes and backslash are not special")
-complete -c xargs -s e -l eof -d (N_ "Set the end of file string to eof-str")
-complete -c xargs -s E -r -f -d (N_ "Set the end of file string to eof-str")
-complete -c xargs -l help -d (N_ "Display help and exit")
-complete -c xargs -s i -l replace -d (N_ "Replace replace-str in the initial arguments with names from standard input")
-complete -c xargs -s I -r -f -d (N_ "Replace replace-str in the initial arguments with names from standard input")
-complete -c xargs -s l -l max-lines -d (N_ "Use at most max-lines nonblank input lines per command line")
-complete -c xargs -s L -r -f -d (N_ "Use at most max-lines nonblank input lines per command line")
-complete -c xargs -s n -l max-args -r -f -d (N_ "Use at most max-args arguments per command line")
-complete -c xargs -s p -l interactive -d (N_ "Prompt the user about whether to run each command line and read a line from the terminal")
-complete -c xargs -s r -l no-run-if-empty -d (N_ "If the standard input does not contain any nonblanks, do not run the command")
-complete -c xargs -s s -l max-chars -r -f -d (N_ "Use at most max-chars characters per command line")
-complete -c xargs -s t -l verbose -d (N_ "Print the command line on the standard error output before executing it")
-complete -c xargs -l version -d (N_ "Display version and exit")
-complete -c xargs -s x -l exit -d (N_ "Exit if the size is exceeded")
-complete -c xargs -s P -l max-procs -r -f -d (N_ "Run up to max-procs processes at a time")
+complete -c xargs -s 0 -l null --description "Input filenames are terminated by a null character instead of by whitespace, and the quotes and backslash are not special"
+complete -c xargs -s e -l eof --description "Set the end of file string to eof-str"
+complete -c xargs -s E -r -f --description "Set the end of file string to eof-str"
+complete -c xargs -l help --description "Display help and exit"
+complete -c xargs -s i -l replace --description "Replace replace-str in the initial arguments with names from standard input"
+complete -c xargs -s I -r -f --description "Replace replace-str in the initial arguments with names from standard input"
+complete -c xargs -s l -l max-lines --description "Use at most max-lines nonblank input lines per command line"
+complete -c xargs -s L -r -f --description "Use at most max-lines nonblank input lines per command line"
+complete -c xargs -s n -l max-args -r -f --description "Use at most max-args arguments per command line"
+complete -c xargs -s p -l interactive --description "Prompt the user about whether to run each command line and read a line from the terminal"
+complete -c xargs -s r -l no-run-if-empty --description "If the standard input does not contain any nonblanks, do not run the command"
+complete -c xargs -s s -l max-chars -r -f --description "Use at most max-chars characters per command line"
+complete -c xargs -s t -l verbose --description "Print the command line on the standard error output before executing it"
+complete -c xargs -l version --description "Display version and exit"
+complete -c xargs -s x -l exit --description "Exit if the size is exceeded"
+complete -c xargs -s P -l max-procs -r -f --description "Run up to max-procs processes at a time"
diff --git a/share/completions/xmms.fish b/share/completions/xmms.fish
index 65887d31..6f5245ce 100644
--- a/share/completions/xmms.fish
+++ b/share/completions/xmms.fish
@@ -3,14 +3,14 @@
# Vikas Gorur <vikas@80x25.org>
#
-complete -c xmms -s h -l help -d (N_ "Show summary of options")
-complete -c xmms -s n -l session -d (N_ "Select XMMS session (Default: 0)")
-complete -c xmms -s r -l rew -d (N_ "Skip backwards in playlist")
-complete -c xmms -s p -l play -d (N_ "Start playing current playlist")
-complete -c xmms -s u -l pause -d (N_ "Pause current song")
-complete -c xmms -s s -l stop -d (N_ "Stop current song")
-complete -c xmms -s t -l play-pause -d (N_ "Pause if playing, play otherwise")
-complete -c xmms -s f -l fwd -d (N_ "Skip forward in playlist")
-complete -c xmms -s e -l enqueue -d (N_ "Don't clear the playlist")
-complete -c xmms -s m -l show-main-window -d (N_ "Show the main window")
-complete -c xmms -s v -l version -d (N_ "Print the version number and exit") \ No newline at end of file
+complete -c xmms -s h -l help --description "Show summary of options"
+complete -c xmms -s n -l session --description "Select XMMS session (Default: 0)"
+complete -c xmms -s r -l rew --description "Skip backwards in playlist"
+complete -c xmms -s p -l play --description "Start playing current playlist"
+complete -c xmms -s u -l pause --description "Pause current song"
+complete -c xmms -s s -l stop --description "Stop current song"
+complete -c xmms -s t -l play-pause --description "Pause if playing, play otherwise"
+complete -c xmms -s f -l fwd --description "Skip forward in playlist"
+complete -c xmms -s e -l enqueue --description "Don't clear the playlist"
+complete -c xmms -s m -l show-main-window --description "Show the main window"
+complete -c xmms -s v -l version --description "Print the version number and exit" \ No newline at end of file
diff --git a/share/completions/xpdf.fish b/share/completions/xpdf.fish
index 529b5df3..99d4aa46 100644
--- a/share/completions/xpdf.fish
+++ b/share/completions/xpdf.fish
@@ -3,34 +3,34 @@
# Vikas Gorur <vikas@80x25.org>
#
-complete -c xpdf -s g -d (N_ "Set the initial window geometry")
-complete -c xpdf -o title -d (N_ "Set the window title")
-complete -c xpdf -o cmap -d (N_ "Install a private colormap")
-complete -c xpdf -o rgb -d (N_ "Set the size of the largest RGB cube xpdf will try to allocate")
-complete -c xpdf -o rv -d (N_ "Set reverse video mode")
-complete -c xpdf -o papercolor -d (N_ "Set the background of the page display")
-complete -c xpdf -o mattecolor -d (N_ "Set the color for background outside the page area")
-complete -c xpdf -s z -d (N_ "Set the initial zoom factor")
-complete -c xpdf -o cont -d (N_ "Start in continuous view mode")
-complete -c xpdf -o t1lib -a "yes no" -d (N_ "Enable or disable t1lib (Default: yes)")
-complete -c xpdf -o freetype -a "yes no" -d (N_ "Enable or disable FreeType (Default: yes)")
-complete -c xpdf -o aa -a "yes no" -d (N_ "Enable or disable font anti-aliasing (Default: yes)")
-complete -c xpdf -o ps -d (N_ "Set the default file name for PostScript output")
-complete -c xpdf -o paper -a "letter legal A4 A3 match" -d (N_ "Set the paper size")
-complete -c xpdf -o paperw -d (N_ "Set the paper width, in points")
-complete -c xpdf -o paperh -d (N_ "Set the paper height, in points")
-complete -c xpdf -o level1 -d (N_ "Generate Level 1 PostScript")
-complete -c xpdf -o enc -d (N_ "Sets the encoding to use for text output")
-complete -c xpdf -o eol -a "unix dos mac" -d (N_ "Sets the end-of-line convention to use")
-complete -c xpdf -o opw -d (N_ "Specify the owner password for the PDF file")
-complete -c xpdf -o upw -d (N_ "Specify the user password for the PDF file")
-complete -c xpdf -o fullscreen -d (N_ "Open xpdf in full-screen mode")
-complete -c xpdf -o remote -d (N_ "Start/contact xpdf remote server")
-complete -c xpdf -o reload -d (N_ "Reload xpdf remote server window")
-complete -c xpdf -o raise -d (N_ "Raise xpdf remote server window")
-complete -c xpdf -o quit -d (N_ "Kill xpdf remote server")
-complete -c xpdf -o cmd -d (N_ "Print commands as they're executed")
-complete -c xpdf -s q -d (N_ "Don't print any messages or errors")
-complete -c xpdf -o cfg -d (N_ "Specify config file to use instead of ~/.xpdfrc")
-complete -c xpdf -s v -d (N_ "Print copyright and version information")
-complete -c xpdf -s h -d (N_ "Print usage information")
+complete -c xpdf -s g --description "Set the initial window geometry"
+complete -c xpdf -o title --description "Set the window title"
+complete -c xpdf -o cmap --description "Install a private colormap"
+complete -c xpdf -o rgb --description "Set the size of the largest RGB cube xpdf will try to allocate"
+complete -c xpdf -o rv --description "Set reverse video mode"
+complete -c xpdf -o papercolor --description "Set the background of the page display"
+complete -c xpdf -o mattecolor --description "Set the color for background outside the page area"
+complete -c xpdf -s z --description "Set the initial zoom factor"
+complete -c xpdf -o cont --description "Start in continuous view mode"
+complete -c xpdf -o t1lib -a "yes no" --description "Enable or disable t1lib (Default: yes)"
+complete -c xpdf -o freetype -a "yes no" --description "Enable or disable FreeType (Default: yes)"
+complete -c xpdf -o aa -a "yes no" --description "Enable or disable font anti-aliasing (Default: yes)"
+complete -c xpdf -o ps --description "Set the default file name for PostScript output"
+complete -c xpdf -o paper -a "letter legal A4 A3 match" --description "Set the paper size"
+complete -c xpdf -o paperw --description "Set the paper width, in points"
+complete -c xpdf -o paperh --description "Set the paper height, in points"
+complete -c xpdf -o level1 --description "Generate Level 1 PostScript"
+complete -c xpdf -o enc --description "Sets the encoding to use for text output"
+complete -c xpdf -o eol -a "unix dos mac" --description "Sets the end-of-line convention to use"
+complete -c xpdf -o opw --description "Specify the owner password for the PDF file"
+complete -c xpdf -o upw --description "Specify the user password for the PDF file"
+complete -c xpdf -o fullscreen --description "Open xpdf in full-screen mode"
+complete -c xpdf -o remote --description "Start/contact xpdf remote server"
+complete -c xpdf -o reload --description "Reload xpdf remote server window"
+complete -c xpdf -o raise --description "Raise xpdf remote server window"
+complete -c xpdf -o quit --description "Kill xpdf remote server"
+complete -c xpdf -o cmd --description "Print commands as they're executed"
+complete -c xpdf -s q --description "Don't print any messages or errors"
+complete -c xpdf -o cfg --description "Specify config file to use instead of ~/.xpdfrc"
+complete -c xpdf -s v --description "Print copyright and version information"
+complete -c xpdf -s h --description "Print usage information"
diff --git a/share/completions/xprop.fish b/share/completions/xprop.fish
index bdb9c337..41fc4d23 100644
--- a/share/completions/xprop.fish
+++ b/share/completions/xprop.fish
@@ -1,29 +1,29 @@
-complete -c xprop -o help -d (N_ "Display help and exit")
-complete -c xprop -o grammar -d (N_ "Display grammar and exit")
-complete -c xprop -o id -x -d (N_ "Select window by id")
-complete -c xprop -o name -d (N_ "Select window by name")
-complete -c xprop -o font -x -d (N_ "Display font properties")
-complete -c xprop -o root -d (N_ "Select root window")
-complete -c xprop -o display -d (N_ "Specify X server")
-complete -c xprop -o len -x -d (N_ "Maximum display length")
-complete -c xprop -o notype -d (N_ "Do not show property type")
-complete -c xprop -o fs -r -d (N_ "Set format file")
+complete -c xprop -o help --description "Display help and exit"
+complete -c xprop -o grammar --description "Display grammar and exit"
+complete -c xprop -o id -x --description "Select window by id"
+complete -c xprop -o name --description "Select window by name"
+complete -c xprop -o font -x --description "Display font properties"
+complete -c xprop -o root --description "Select root window"
+complete -c xprop -o display --description "Specify X server"
+complete -c xprop -o len -x --description "Maximum display length"
+complete -c xprop -o notype --description "Do not show property type"
+complete -c xprop -o fs -r --description "Set format file"
complete -c xprop -o frame -d (N_ "Select a window by clicking on its frame" )
-complete -c xprop -o remove -d (N_ "Remove property") -x -a "
+complete -c xprop -o remove --description "Remove property" -x -a "
(
xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
)
"
-complete -c xprop -o set -d (N_ "Set property") -x -a "
+complete -c xprop -o set --description "Set property" -x -a "
(
xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
)
"
-complete -c xprop -o spy -d (N_ "Examine property updates forever")
-complete -c xprop -o f -d (N_ "Set format")
+complete -c xprop -o spy --description "Examine property updates forever"
+complete -c xprop -o f --description "Set format"
complete -c xprop -d Property -x -a "
(
xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1
diff --git a/share/completions/xsel.fish b/share/completions/xsel.fish
index fea6409a..3480058d 100644
--- a/share/completions/xsel.fish
+++ b/share/completions/xsel.fish
@@ -1,18 +1,18 @@
-complete -c xsel -s a -l append -d (N_ "Append input to selection")
-complete -c xsel -s f -l follow -d (N_ "Append to selection as input grows")
-complete -c xsel -s i -l input -d (N_ "Read into selection")
-complete -c xsel -s o -l output -d (N_ "Write selection")
-complete -c xsel -s c -l clear -d (N_ "Clear selection")
-complete -c xsel -s d -l delete -d (N_ "Delete selection")
-complete -c xsel -s p -l primary -d (N_ "Use primary selection")
-complete -c xsel -s s -l secondary -d (N_ "Use secondary selection")
-complete -c xsel -s b -l clipboard -d (N_ "Use clipboard selection")
-complete -c xsel -s k -l keep -d (N_ "Make current selections persistent after program exit")
-complete -c xsel -s x -l exchange -d (N_ "Exchange primary and secondary selections")
-complete -c xsel -l display -x -d (N_ "X server display")
-complete -c xsel -s t -l selectionTimeout -d (N_ "Timeout for retrieving selection")
-complete -c xsel -s l -l logfile -f -d (N_ "Error log")
-complete -c xsel -s n -l nodetach -d (N_ "Do not detach from the controlling terminal")
-complete -c xsel -s h -l help -d (N_ "Display help and exit")
-complete -c xsel -s v -l verbose -d (N_ "Print informative messages")
-complete -c xsel -l version -d (N_ "Display version and exit")
+complete -c xsel -s a -l append --description "Append input to selection"
+complete -c xsel -s f -l follow --description "Append to selection as input grows"
+complete -c xsel -s i -l input --description "Read into selection"
+complete -c xsel -s o -l output --description "Write selection"
+complete -c xsel -s c -l clear --description "Clear selection"
+complete -c xsel -s d -l delete --description "Delete selection"
+complete -c xsel -s p -l primary --description "Use primary selection"
+complete -c xsel -s s -l secondary --description "Use secondary selection"
+complete -c xsel -s b -l clipboard --description "Use clipboard selection"
+complete -c xsel -s k -l keep --description "Make current selections persistent after program exit"
+complete -c xsel -s x -l exchange --description "Exchange primary and secondary selections"
+complete -c xsel -l display -x --description "X server display"
+complete -c xsel -s t -l selectionTimeout --description "Timeout for retrieving selection"
+complete -c xsel -s l -l logfile -f --description "Error log"
+complete -c xsel -s n -l nodetach --description "Do not detach from the controlling terminal"
+complete -c xsel -s h -l help --description "Display help and exit"
+complete -c xsel -s v -l verbose --description "Print informative messages"
+complete -c xsel -l version --description "Display version and exit"
diff --git a/share/completions/yum.fish b/share/completions/yum.fish
index 57c24dc1..ead30a6a 100644
--- a/share/completions/yum.fish
+++ b/share/completions/yum.fish
@@ -43,21 +43,21 @@ complete -c yum -n '__fish_yum_has_command' -xa "
complete -c yum -n '__fish_yum_package_ok' -a "(__fish_print_packages)"
-complete -c yum -s h -l help -d (N_ "Display help and exit")
-complete -c yum -s y -d (N_ "Assume yes to all questions")
-complete -c yum -s c -d (N_ "Configuration file") -r
-complete -c yum -s d -d (N_ "Set debug level") -x
-complete -c yum -s e -d (N_ "Set error level") -x
-complete -c yum -s t -l tolerant -d (N_ "Be tolerant of errors in commandline")
-complete -c yum -s R -d (N_ "Set maximum delay between commands") -x
-complete -c yum -s c -d (N_ "Run commands from cache")
-complete -c yum -l version -d (N_ "Display version and exit")
-complete -c yum -l installroot -d (N_ "Specify installroot") -r
-complete -c yum -l enablerepo -d (N_ "Enable repository") -r
-complete -c yum -l disablerepo -d (N_ "Disable repository") -r
-complete -c yum -l obsoletes -d (N_ "Enables obsolets processing logic")
-complete -c yum -l rss-filename -d (N_ "Output rss-data to file") -r
-complete -c yum -l exclude -d (N_ "Exclude specified package from updates") -a "(__fish_print_packages)"
+complete -c yum -s h -l help --description "Display help and exit"
+complete -c yum -s y --description "Assume yes to all questions"
+complete -c yum -s c --description "Configuration file" -r
+complete -c yum -s d --description "Set debug level" -x
+complete -c yum -s e --description "Set error level" -x
+complete -c yum -s t -l tolerant --description "Be tolerant of errors in commandline"
+complete -c yum -s R --description "Set maximum delay between commands" -x
+complete -c yum -s c --description "Run commands from cache"
+complete -c yum -l version --description "Display version and exit"
+complete -c yum -l installroot --description "Specify installroot" -r
+complete -c yum -l enablerepo --description "Enable repository" -r
+complete -c yum -l disablerepo --description "Disable repository" -r
+complete -c yum -l obsoletes --description "Enables obsolets processing logic"
+complete -c yum -l rss-filename --description "Output rss-data to file" -r
+complete -c yum -l exclude --description "Exclude specified package from updates" -a "(__fish_print_packages)"
complete -c yum -n 'contains list (commandline -poc)' -a "
all\t'List all packages'
diff --git a/share/completions/zcat.fish b/share/completions/zcat.fish
index 1be595a0..0c952d77 100644
--- a/share/completions/zcat.fish
+++ b/share/completions/zcat.fish
@@ -3,8 +3,8 @@ complete -c zcat -x -a "(
__fish_complete_suffix (commandline -ct) .tgz 'Compressed archive'
)
"
-complete -c zcat -s f -l force -d (N_ "Overwrite")
-complete -c zcat -s h -l help -d (N_ "Display help and exit")
-complete -c zcat -s L -l license -d (N_ "Print license")
-complete -c zcat -s V -l version -d (N_ "Display version and exit")
+complete -c zcat -s f -l force --description "Overwrite"
+complete -c zcat -s h -l help --description "Display help and exit"
+complete -c zcat -s L -l license --description "Print license"
+complete -c zcat -s V -l version --description "Display version and exit"
diff --git a/share/completions/zip.fish b/share/completions/zip.fish
index 9f74fe1d..f20cb296 100644
--- a/share/completions/zip.fish
+++ b/share/completions/zip.fish
@@ -1,32 +1,32 @@
# Completions for zip
-complete -c zip -s f -d (N_ "Freshen: only changed files")
-complete -c zip -s d -d (N_ "Delete entries in zipfile")
-complete -c zip -s u -d (N_ "Update: only changed or newer files")
-complete -c zip -s m -d (N_ "Move into zipfile (delete files)")
-complete -c zip -s r -d (N_ "Operate recursively")
-complete -c zip -s j -d (N_ "Do not store directory names")
-complete -c zip -s 0 -d (N_ "Do not compress at all")
-complete -c zip -s l -d (N_ "Convert LF to CR LF")
-complete -c zip -o ll -d (N_ "Convert CR LF to LF")
-complete -c zip -s 1 -d (N_ "Compress faster")
-complete -c zip -s 9 -d (N_ "Compress better")
-complete -c zip -s q -d (N_ "Quiet mode")
-complete -c zip -s v -d (N_ "Verbose mode")
-complete -c zip -s c -d (N_ "Add one-line comments")
-complete -c zip -s z -d (N_ "Add zipfile comments")
-complete -c zip -s @ -d (N_ "Read names from stdin")
-complete -c zip -s o -d (N_ "Make zipfile as old as the latest entry")
-complete -c zip -s x -r -d (N_ "Exclude the following names")
-complete -c zip -s i -r -d (N_ "Include only the following names")
-complete -c zip -s F -d (N_ "Fix zipfile")
-complete -c zip -o FF -d (N_ "Fix zipfile (try harder)")
-complete -c zip -s A -d (N_ "Adjust offsets to suit self-extracting exe")
-complete -c zip -s J -d (N_ "Strip prepended data")
-complete -c zip -s T -d (N_ "Test zipfile integrity")
-complete -c zip -s X -d (N_ "Exclude extra file attributes")
-complete -c zip -s y -d (N_ "Store symbolic links as links")
-complete -c zip -s R -d (N_ "PKZIP recursion")
-complete -c zip -s e -d (N_ "Encrypt")
-complete -c zip -s n -r -d (N_ "Don\'t compress files with these suffixes")
-complete -c zip -s h -d (N_ "Display help and exit")
+complete -c zip -s f --description "Freshen: only changed files"
+complete -c zip -s d --description "Delete entries in zipfile"
+complete -c zip -s u --description "Update: only changed or newer files"
+complete -c zip -s m --description "Move into zipfile (delete files)"
+complete -c zip -s r --description "Operate recursively"
+complete -c zip -s j --description "Do not store directory names"
+complete -c zip -s 0 --description "Do not compress at all"
+complete -c zip -s l --description "Convert LF to CR LF"
+complete -c zip -o ll --description "Convert CR LF to LF"
+complete -c zip -s 1 --description "Compress faster"
+complete -c zip -s 9 --description "Compress better"
+complete -c zip -s q --description "Quiet mode"
+complete -c zip -s v --description "Verbose mode"
+complete -c zip -s c --description "Add one-line comments"
+complete -c zip -s z --description "Add zipfile comments"
+complete -c zip -s @ --description "Read names from stdin"
+complete -c zip -s o --description "Make zipfile as old as the latest entry"
+complete -c zip -s x -r --description "Exclude the following names"
+complete -c zip -s i -r --description "Include only the following names"
+complete -c zip -s F --description "Fix zipfile"
+complete -c zip -o FF --description "Fix zipfile (try harder)"
+complete -c zip -s A --description "Adjust offsets to suit self-extracting exe"
+complete -c zip -s J --description "Strip prepended data"
+complete -c zip -s T --description "Test zipfile integrity"
+complete -c zip -s X --description "Exclude extra file attributes"
+complete -c zip -s y --description "Store symbolic links as links"
+complete -c zip -s R --description "PKZIP recursion"
+complete -c zip -s e --description "Encrypt"
+complete -c zip -s n -r --description "Don\'t compress files with these suffixes"
+complete -c zip -s h --description "Display help and exit"
diff --git a/share/functions/N_.fish b/share/functions/N_.fish
index d4f24db2..74c39b4a 100644
--- a/share/functions/N_.fish
+++ b/share/functions/N_.fish
@@ -1,6 +1,6 @@
-function N_ -d "No-op"
+function N_ --description "No-op"
printf "%s" $argv
end
diff --git a/share/functions/__fish_complete_bittorrent.fish b/share/functions/__fish_complete_bittorrent.fish
index b9581c55..d78d0c10 100644
--- a/share/functions/__fish_complete_bittorrent.fish
+++ b/share/functions/__fish_complete_bittorrent.fish
@@ -1,33 +1,33 @@
# Bittorrent commands
function __fish_complete_bittorrent
- complete -c $argv -l max_uploads -x -d (N_ "Maximum uploads at once")
- complete -c $argv -l keepalive_interval -x -d (N_ "Number of seconds between keepalives")
- complete -c $argv -l download_slice_size -x -d (N_ "Bytes per request")
- complete -c $argv -l request_backlog -x -d (N_ "Requests per pipe")
- complete -c $argv -l max_message_length -x -d (N_ "Maximum length prefix encoding")
- complete -c $argv -l ip -d (N_ "IP to report to the tracker") -x -a "(__fish_print_addresses)"
- complete -c $argv -l minport -d (N_ "Minimum port to listen to")
- complete -c $argv -l maxport -d (N_ "Maximum port to listen to")
- complete -c $argv -l responsefile -r -d (N_ "File for server response")
- complete -c $argv -l url -x -d (N_ "URL to get file from")
- complete -c $argv -l saveas -r -d (N_ "Local file target")
- complete -c $argv -l timeout -x -d (N_ "Time to close inactive socket")
- complete -c $argv -l timeout_check_interval -x -d (N_ "Time between checking timeouts")
- complete -c $argv -l max_slice_length -x -d (N_ "Maximum outgoing slice length")
- complete -c $argv -l max_rate_period -x -d (N_ "Maximum time to guess rate")
- complete -c $argv -l bind -x -d (N_ "IP to bind to locally") -a "(__fish_print_addresses)"
- complete -c $argv -l display_interval -x -d (N_ "Time between screen updates")
- complete -c $argv -l rerequest_interval -x -d (N_ "Time to wait between requesting more peers")
- complete -c $argv -l min_peers -x -d (N_ "Minimum number of peers to not do requesting")
- complete -c $argv -l http_timeout -x -d (N_ "Number of seconds before assuming http timeout")
- complete -c $argv -l max_initiate -x -d (N_ "Number of peers at which to stop initiating new connections")
- complete -c $argv -l max_allow_in -x -d (N_ "Maximum number of connections to allow")
- complete -c $argv -l check_hashes -x -d (N_ "Whether to check hashes on disk")
- complete -c $argv -l max_upload_rate -x -d (N_ "Maximum kB/s to upload at")
- complete -c $argv -l snub_time -x -d (N_ "Seconds to wait for data to come in before assuming choking")
- complete -c $argv -l spew -x -d (N_ "Whether to display diagnostic info")
- complete -c $argv -l rarest_first_cutoff -x -d (N_ "Number of downloads at which to switch from random to rarest first")
- complete -c $argv -l min_uploads -x -d (N_ "Number of uploads to fill out to with optimistic unchokes")
- complete -c $argv -l report_hash_failiures -x -d (N_ "Whether to inform the user that hash failures occur")
+ complete -c $argv -l max_uploads -x --description "Maximum uploads at once"
+ complete -c $argv -l keepalive_interval -x --description "Number of seconds between keepalives"
+ complete -c $argv -l download_slice_size -x --description "Bytes per request"
+ complete -c $argv -l request_backlog -x --description "Requests per pipe"
+ complete -c $argv -l max_message_length -x --description "Maximum length prefix encoding"
+ complete -c $argv -l ip --description "IP to report to the tracker" -x -a "(__fish_print_addresses)"
+ complete -c $argv -l minport --description "Minimum port to listen to"
+ complete -c $argv -l maxport --description "Maximum port to listen to"
+ complete -c $argv -l responsefile -r --description "File for server response"
+ complete -c $argv -l url -x --description "URL to get file from"
+ complete -c $argv -l saveas -r --description "Local file target"
+ complete -c $argv -l timeout -x --description "Time to close inactive socket"
+ complete -c $argv -l timeout_check_interval -x --description "Time between checking timeouts"
+ complete -c $argv -l max_slice_length -x --description "Maximum outgoing slice length"
+ complete -c $argv -l max_rate_period -x --description "Maximum time to guess rate"
+ complete -c $argv -l bind -x --description "IP to bind to locally" -a "(__fish_print_addresses)"
+ complete -c $argv -l display_interval -x --description "Time between screen updates"
+ complete -c $argv -l rerequest_interval -x --description "Time to wait between requesting more peers"
+ complete -c $argv -l min_peers -x --description "Minimum number of peers to not do requesting"
+ complete -c $argv -l http_timeout -x --description "Number of seconds before assuming http timeout"
+ complete -c $argv -l max_initiate -x --description "Number of peers at which to stop initiating new connections"
+ complete -c $argv -l max_allow_in -x --description "Maximum number of connections to allow"
+ complete -c $argv -l check_hashes -x --description "Whether to check hashes on disk"
+ complete -c $argv -l max_upload_rate -x --description "Maximum kB/s to upload at"
+ complete -c $argv -l snub_time -x --description "Seconds to wait for data to come in before assuming choking"
+ complete -c $argv -l spew -x --description "Whether to display diagnostic info"
+ complete -c $argv -l rarest_first_cutoff -x --description "Number of downloads at which to switch from random to rarest first"
+ complete -c $argv -l min_uploads -x --description "Number of uploads to fill out to with optimistic unchokes"
+ complete -c $argv -l report_hash_failiures -x --description "Whether to inform the user that hash failures occur"
end
diff --git a/share/functions/__fish_complete_ls.fish b/share/functions/__fish_complete_ls.fish
index 2e83c86c..ff3bf4e0 100644
--- a/share/functions/__fish_complete_ls.fish
+++ b/share/functions/__fish_complete_ls.fish
@@ -13,62 +13,62 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
# Shared ls switches
- __fish_gnu_complete $cmds -s a -l all -d (N_ "Show hidden") $is_gnu
- __fish_gnu_complete $cmds -s A -l almost-all -d (N_ "Show hidden except . and ..") $is_gnu
- __fish_gnu_complete $cmds -s F -l classify -d (N_ "Append filetype indicator") $is_gnu
- __fish_gnu_complete $cmds -s H -l dereference-command-line -d (N_ "Follow symlinks") $is_gnu
- __fish_gnu_complete $cmds -s L -l dereference -d (N_ "Follow symlinks") $is_gnu
- __fish_gnu_complete $cmds -s R -l recursive -d (N_ "List subdirectory recursively") $is_gnu
- __fish_gnu_complete $cmds -s b -l escape -d (N_ "Octal escapes for non graphic characters") $is_gnu
- __fish_gnu_complete $cmds -s d -l directory -d (N_ "List directories, not their content") $is_gnu
- __fish_gnu_complete $cmds -s h -l human-readable -d (N_ "Human readable sizes") $is_gnu
- __fish_gnu_complete $cmds -s i -l inode -d (N_ "Print inode number of files") $is_gnu
- __fish_gnu_complete $cmds -s n -l numeric-uid-gid -d (N_ "Long format, numeric IDs") $is_gnu
- __fish_gnu_complete $cmds -s p -l file-type -d (N_ "Append filetype indicator") $is_gnu
- __fish_gnu_complete $cmds -s q -l hide-control-chars -d (N_ "Replace non-graphic characters with '?'") $is_gnu
- __fish_gnu_complete $cmds -s r -l reverse -d (N_ "Reverse sort order") $is_gnu
- __fish_gnu_complete $cmds -s s -l size -d (N_ "Print size of files") $is_gnu
+ __fish_gnu_complete $cmds -s a -l all --description "Show hidden" $is_gnu
+ __fish_gnu_complete $cmds -s A -l almost-all --description "Show hidden except . and .." $is_gnu
+ __fish_gnu_complete $cmds -s F -l classify --description "Append filetype indicator" $is_gnu
+ __fish_gnu_complete $cmds -s H -l dereference-command-line --description "Follow symlinks" $is_gnu
+ __fish_gnu_complete $cmds -s L -l dereference --description "Follow symlinks" $is_gnu
+ __fish_gnu_complete $cmds -s R -l recursive --description "List subdirectory recursively" $is_gnu
+ __fish_gnu_complete $cmds -s b -l escape --description "Octal escapes for non graphic characters" $is_gnu
+ __fish_gnu_complete $cmds -s d -l directory --description "List directories, not their content" $is_gnu
+ __fish_gnu_complete $cmds -s h -l human-readable --description "Human readable sizes" $is_gnu
+ __fish_gnu_complete $cmds -s i -l inode --description "Print inode number of files" $is_gnu
+ __fish_gnu_complete $cmds -s n -l numeric-uid-gid --description "Long format, numeric IDs" $is_gnu
+ __fish_gnu_complete $cmds -s p -l file-type --description "Append filetype indicator" $is_gnu
+ __fish_gnu_complete $cmds -s q -l hide-control-chars --description "Replace non-graphic characters with '?'" $is_gnu
+ __fish_gnu_complete $cmds -s r -l reverse --description "Reverse sort order" $is_gnu
+ __fish_gnu_complete $cmds -s s -l size --description "Print size of files" $is_gnu
- complete $cmds -s C -d (N_ "List by columns")
- complete $cmds -s S -d (N_ "Sort by size")
- complete $cmds -s c -d (N_ "Show and sort by ctime")
- complete $cmds -s f -d (N_ "Don't sort")
- complete $cmds -s g -d (N_ "Long format without owner")
- complete $cmds -s k -d (N_ "Set blocksize to 1kB")
- complete $cmds -s l -d (N_ "Long format")
- complete $cmds -s m -d (N_ "Comma separated format")
- complete $cmds -s t -d (N_ "Sort by modification time")
- complete $cmds -s u -d (N_ "Show access time")
- complete $cmds -s x -d (N_ "List entries by lines")
- complete $cmds -s 1 -d (N_ "List one file per line")
+ complete $cmds -s C --description "List by columns"
+ complete $cmds -s S --description "Sort by size"
+ complete $cmds -s c --description "Show and sort by ctime"
+ complete $cmds -s f --description "Don't sort"
+ complete $cmds -s g --description "Long format without owner"
+ complete $cmds -s k --description "Set blocksize to 1kB"
+ complete $cmds -s l --description "Long format"
+ complete $cmds -s m --description "Comma separated format"
+ complete $cmds -s t --description "Sort by modification time"
+ complete $cmds -s u --description "Show access time"
+ complete $cmds -s x --description "List entries by lines"
+ complete $cmds -s 1 --description "List one file per line"
if test -n "$is_gnu"
# GNU specific ls switches
- complete $cmds -l hide -d (N_ "Do not list implied entries matching specified shell pattern") -r
- complete $cmds -l lcontext -d (N_ "Display security context")
- complete $cmds -l context -s Z -d (N_ "Display security context so it fits on most displays")
- complete $cmds -l scontext -d (N_ "Display only security context and file name")
+ complete $cmds -l hide --description "Do not list implied entries matching specified shell pattern" -r
+ complete $cmds -l lcontext --description "Display security context"
+ complete $cmds -l context -s Z --description "Display security context so it fits on most displays"
+ complete $cmds -l scontext --description "Display only security context and file name"
- complete $cmds -l author -d (N_ "Print author")
- complete $cmds -l blocksize -x -d (N_ "Set block size")
- complete $cmds -s B -l ignore-backups -d (N_ "Ignore files ending with ~")
- complete $cmds -l color -f -a "never always auto" -d (N_ "Use colors")
- complete $cmds -s D -l dired -d (N_ "Generate dired output")
- complete $cmds -l format -x -a "across commas horizontal long single-column verbose vertical" -d (N_ "List format")
- complete $cmds -l full-time -d (N_ "Long format, full-iso time")
- complete $cmds -s G -l no-group -d (N_ "Don't print group information")
- complete $cmds -l si -d (N_ "Human readable sizes, powers of 1000")
- complete $cmds -l dereference-command-line-symlink-to-dir #-d (N_ "Follow directory symlinks from command line")
- complete $cmds -l indicator-style -x -a "none classify file-type" -d (N_ "Append filetype indicator")
- complete $cmds -s I -l ignore -r -d (N_ "Skip entries matching pattern")
- complete $cmds -s N -l literal -d (N_ "Print raw entry names")
- complete $cmds -s o -d (N_ "Long format without groups")
- complete $cmds -l show-control-chars -d (N_ "Non graphic as-is")
- complete $cmds -s Q -l quote-name -d (N_ "Enclose entry in quotes")
- complete $cmds -l quoting-style -x -a "literal locale shell shell-always c escape" -d (N_ "Select quoting style")
- complete $cmds -l sort -x -d (N_ "Sort criteria") -a "
+ complete $cmds -l author --description "Print author"
+ complete $cmds -l blocksize -x --description "Set block size"
+ complete $cmds -s B -l ignore-backups --description "Ignore files ending with ~"
+ complete $cmds -l color -f -a "never always auto" --description "Use colors"
+ complete $cmds -s D -l dired --description "Generate dired output"
+ complete $cmds -l format -x -a "across commas horizontal long single-column verbose vertical" --description "List format"
+ complete $cmds -l full-time --description "Long format, full-iso time"
+ complete $cmds -s G -l no-group --description "Don't print group information"
+ complete $cmds -l si --description "Human readable sizes, powers of 1000"
+ complete $cmds -l dereference-command-line-symlink-to-dir #--description "Follow directory symlinks from command line"
+ complete $cmds -l indicator-style -x -a "none classify file-type" --description "Append filetype indicator"
+ complete $cmds -s I -l ignore -r --description "Skip entries matching pattern"
+ complete $cmds -s N -l literal --description "Print raw entry names"
+ complete $cmds -s o --description "Long format without groups"
+ complete $cmds -l show-control-chars --description "Non graphic as-is"
+ complete $cmds -s Q -l quote-name --description "Enclose entry in quotes"
+ complete $cmds -l quoting-style -x -a "literal locale shell shell-always c escape" --description "Select quoting style"
+ complete $cmds -l sort -x --description "Sort criteria" -a "
extension\t'Sort by file extension'
none\tDon\'t\ sort
size\t'Sort by size'
@@ -79,35 +79,35 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
access\t'Sort by access time'
use\t'Sort by access time'
"
- complete $cmds -l time -x -d (N_ "Show time type") -a "
+ complete $cmds -l time -x --description "Show time type" -a "
time\t'Sort by modification time'
access\t'Sort by access time'
use\t'Sort by use time'
ctime\t'Sort by file status modification time'
status\t'Sort by status time'
"
- complete $cmds -l time-style -x -a "full-iso long-iso iso locale" -d (N_ "Select time style")
- complete $cmds -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" -d (N_ "Assume tab stops at each COLS")
- complete $cmds -s U -d (N_ "Do not sort")
- complete $cmds -s v -d (N_ "Sort by version")
- complete $cmds -s w -l width -x -d (N_ "Assume screen width")
- complete $cmds -s X -d (N_ "Sort by extension")
- complete $cmds -l help -d (N_ "Display help and exit")
- complete $cmds -l version -d (N_ "Display version and exit")
+ complete $cmds -l time-style -x -a "full-iso long-iso iso locale" --description "Select time style"
+ complete $cmds -s T -l tabsize -x -a "1 2 3 4 5 6 7 8 9 10 11 12" --description "Assume tab stops at each COLS"
+ complete $cmds -s U --description "Do not sort"
+ complete $cmds -s v --description "Sort by version"
+ complete $cmds -s w -l width -x --description "Assume screen width"
+ complete $cmds -s X --description "Sort by extension"
+ complete $cmds -l help --description "Display help and exit"
+ complete $cmds -l version --description "Display version and exit"
else
# If not a GNU system, assume we have standard BSD ls features instead
- complete $cmds -s B -d (N_ "Octal escapes for non graphic characters")
- complete $cmds -s G -d (N_ "Use colors")
- complete $cmds -s I -d (N_ "Prevent -A from being automatically set for root")
- complete $cmds -s P -d (N_ "Don't follow symlinks")
- complete $cmds -s T -d (N_ "Show modification time")
- complete $cmds -s W -d (N_ "Show whiteouts when scanning directories")
- complete $cmds -s Z -d (N_ "Display each file's MAC label")
- complete $cmds -s o -d (N_ "Include the file flags in a long (-l) output")
- complete $cmds -s w -d (N_ "Print raw entry names")
+ complete $cmds -s B --description "Octal escapes for non graphic characters"
+ complete $cmds -s G --description "Use colors"
+ complete $cmds -s I --description "Prevent -A from being automatically set for root"
+ complete $cmds -s P --description "Don't follow symlinks"
+ complete $cmds -s T --description "Show modification time"
+ complete $cmds -s W --description "Show whiteouts when scanning directories"
+ complete $cmds -s Z --description "Display each file's MAC label"
+ complete $cmds -s o --description "Include the file flags in a long (-l) output"
+ complete $cmds -s w --description "Print raw entry names"
end
diff --git a/share/functions/__fish_complete_ssh.fish b/share/functions/__fish_complete_ssh.fish
index f4c93392..24123996 100644
--- a/share/functions/__fish_complete_ssh.fish
+++ b/share/functions/__fish_complete_ssh.fish
@@ -1,15 +1,15 @@
function __fish_complete_ssh -d "common completions for ssh commands"
- complete -c $argv -s 1 -d (N_ "Protocoll version 1 only")
- complete -c $argv -s 2 -d (N_ "Protocoll version 2 only")
- complete -c $argv -s 4 -d (N_ "IPv4 addresses only")
- complete -c $argv -s 6 -d (N_ "IPv6 addresses only")
- complete -c $argv -s C -d (N_ "Compress all data")
- complete -xc $argv -s c -d (N_ "Encryption algorithm") -a "blowfish 3des des"
- complete -r -c $argv -s F -d (N_ "Configuration file")
- complete -r -c $argv -s i -d (N_ "Identity file")
- complete -x -c $argv -s o -d (N_ "Options") -a "
+ complete -c $argv -s 1 --description "Protocoll version 1 only"
+ complete -c $argv -s 2 --description "Protocoll version 2 only"
+ complete -c $argv -s 4 --description "IPv4 addresses only"
+ complete -c $argv -s 6 --description "IPv6 addresses only"
+ complete -c $argv -s C --description "Compress all data"
+ complete -xc $argv -s c --description "Encryption algorithm" -a "blowfish 3des des"
+ complete -r -c $argv -s F --description "Configuration file"
+ complete -r -c $argv -s i --description "Identity file"
+ complete -x -c $argv -s o --description "Options" -a "
AddressFamily
BatchMode
BindAddress
@@ -56,6 +56,6 @@ function __fish_complete_ssh -d "common completions for ssh commands"
UserKnownHostsFile
VerifyHostKeyDNS
"
- complete -c $argv -s v -d (N_ "Verbose mode")
+ complete -c $argv -s v --description "Verbose mode"
end
diff --git a/share/functions/__fish_complete_tex.fish b/share/functions/__fish_complete_tex.fish
index cf461641..637b7464 100644
--- a/share/functions/__fish_complete_tex.fish
+++ b/share/functions/__fish_complete_tex.fish
@@ -1,8 +1,8 @@
function __fish_complete_tex -d "Common completions for all tex commands"
- complete -c $argv -o help -d (N_ "Display help and exit")
- complete -c $argv -o version -d (N_ "Display version and exit")
+ complete -c $argv -o help --description "Display help and exit"
+ complete -c $argv -o version --description "Display version and exit"
complete -c $argv -x -a "(
__fish_complete_suffix (commandline -ct) .tex '(La)TeX file'
)"