Drop use of the N_ no-op for translation descriptions. Instead, tell xgettext that any token following '--description' should be translated. This should greatly speed up completion loading on platforms where fork() is slow. (Hi, OS X)

darcs-hash:20070116011828-ac50b-fb923dc877869ded4d506bbe0bc5364eea44092f.gz

Makefile.in

@@ -437,7 +437,7 @@ doc.h: $(HDR_FILES)
 messages.pot: *.c *.h etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq
 	if test $(HAVE_GETTEXT) = 1;then \
 		xgettext -k_ -kN_ *.c *.h -o messages.pot; \
-		if xgettext -j -k_ -kN_ -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
+		if xgettext -j -k_ -kN_ -k--description -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
 			echo "Your xgettext version is too old to build the messages.pot file"\
 			rm messages.pot\
 			false;\

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"

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"
 

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"

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"
 

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"

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"

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"
 

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"

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"

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'
 

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"
 

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"
 

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"

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"

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]'
 

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"
 

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"
 

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'

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'
 

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"
 

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"
 
 

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"

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"
 
 

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"
 

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" 
 

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 
 

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)"

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)"

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"
 

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

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

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"

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"
 

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"
 

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."
 

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"
 

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)"
 

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

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"

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"
 

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"

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

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

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"
 

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

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"
 
 
 

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

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"

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"

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"
 

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 ""
 
 

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"
 

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 -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) )" -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 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))" -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 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 -d (N_ "Present a menu which enables you to do all key related tasks") -xa "(__fish_complete_gpg_user_id)"
+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)" -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 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)" -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 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)" -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 -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"

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"

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"
 
 

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'

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"
 

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"

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"
 

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"
 

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"

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"

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)

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"
 

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"

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"
 

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"
 

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"
 

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"

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"
 

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
 

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

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"
 

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"

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"
 

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"
 

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'
 

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

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
 

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"

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"
 

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"

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"

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"

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"

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"
 
 

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"
 

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") )'

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'
 

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"